From: Jonas Fonseca <fonseca@diku.dk>
Date: Sat, 2 Jun 2007 17:59:49 +0000 (+0200)
Subject: git-rebase: suggest to use git-add instead of git-update-index
X-Git-Tag: v1.5.3-rc0~172
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9b07873a52cc0243c2eddfac2e9c514152b96fb7;p=git.git

git-rebase: suggest to use git-add instead of git-update-index

The command is part of the main porcelain making git-add more
appropriate.

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

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"