Do a cross-project merge of Paul Mackerras' gitk visualizer

diff --git a/git-status-script b/git-status-script
index f91bb55894a07f3ebca9031f2fa2ba2ef8789ffd..7d47fdea79aafaab1d6357d8ce478e2fb40b45b0 100755 (executable)
--- 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" ]