diff --git a/git-status-script b/git-status-script
index f91bb55894a07f3ebca9031f2fa2ba2ef8789ffd..e9a03834415e926e8f42df9c0f699204af51fec9 100755 (executable)
--- a/git-status-script
+++ b/git-status-script
T ) echo "# typechange: $name";;
C*) echo "# copied: $name -> $newname";;
R*) echo "# renamed: $name -> $newname";;
- N*) echo "# new file: $name";;
+ A*) echo "# new file: $name";;
U ) echo "# unmerged: $name";;
esac
done
}
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" ]