diff --git a/git-rebase.sh b/git-rebase.sh
index 61770b5a2837b9d69ffb1db455f39ffdb3c8ea00..2aa3a011dbe31e5167534a8bf443ff27dd96b38f 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
if test -n "$unmerged"
then
echo "You still have unmerged paths in your index"
if test -n "$unmerged"
then
echo "You still have unmerged paths in your index"
- echo "did you forget update-index?"
+ echo "did you forget to use git add?"
die "$RESOLVEMSG"
fi
die "$RESOLVEMSG"
fi
--continue)
git-diff-files --quiet || {
echo "You must edit all merge conflicts and then"
--continue)
git-diff-files --quiet || {
echo "You must edit all merge conflicts and then"
- echo "mark them as resolved using git update-index"
+ echo "mark them as resolved using git add"
exit 1
}
if test -d "$dotest"
exit 1
}
if test -d "$dotest"