Skip to content
Browse files

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>
  • Loading branch information...
1 parent 86eff8c commit 9b07873a52cc0243c2eddfac2e9c514152b96fb7 @jonas jonas committed with Junio C Hamano Jun 2, 2007
Showing with 2 additions and 2 deletions.
  1. +2 −2 git-rebase.sh
View
4 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"

0 comments on commit 9b07873

Please sign in to comment.
Something went wrong with that request. Please try again.