X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=git-status-script;h=7d47fdea79aafaab1d6357d8ce478e2fb40b45b0;hb=44ab20cd884dcb3d2ef4cfbda4591dd2cd9bee79;hp=f91bb55894a07f3ebca9031f2fa2ba2ef8789ffd;hpb=2036d841020b7500eca7d568bd0c353b4fe73408;p=git.git diff --git a/git-status-script b/git-status-script index f91bb558..7d47fdea 100755 --- a/git-status-script +++ b/git-status-script @@ -27,7 +27,7 @@ report () { } git-update-cache --refresh >& /dev/null -git-diff-cache -B -C --cached HEAD | sed 's/^://' | report "Updated but not checked in" "will commit" +git-diff-cache -M --cached HEAD | sed 's/^://' | report "Updated but not checked in" "will commit" committable="$?" git-diff-files | sed 's/^://' | report "Changed but not updated" "use git-update-cache to mark for commit" if [ "$committable" == "0" ]