X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-rebase.sh;h=2aa3a011dbe31e5167534a8bf443ff27dd96b38f;hb=71e55854fd6e5c9ce786bcd20efef43bd56f9df0;hp=61770b5a2837b9d69ffb1db455f39ffdb3c8ea00;hpb=fbf5df024e9137d446c5a85adeae7e4780365d1b;p=git.git

diff --git a/git-rebase.sh b/git-rebase.sh
index 61770b5a2..2aa3a011d 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -55,7 +55,7 @@ continue_merge () {
 	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
 
@@ -126,7 +126,7 @@ do
 	--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"