@matheusbsbs / matheus-bagliano / commits / 9b07873a52
Fork 0

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>

Jonas Fonseca committed Jun 2, 2007 at 19:59 UTC 9b07873a52cc0243c2eddfac2e9c514152b96fb7
1 file changed +2 -2
git-rebase.sh
+2 -2
@@ -55,7 +55,7 @@ continue_merge () {
55 if test -n "$unmerged"
56 then
57 echo "You still have unmerged paths in your index"
58 - echo "did you forget update-index?"
58 + echo "did you forget to use git add?"
59 die "$RESOLVEMSG"
60 fi
61
@@ -126,7 +126,7 @@ do
126 --continue)
127 git-diff-files --quiet || {
128 echo "You must edit all merge conflicts and then"
129 - echo "mark them as resolved using git update-index"
129 + echo "mark them as resolved using git add"
130 exit 1
131 }
132 if test -d "$dotest"