diff options
| author | Jonas Fonseca <fonseca@diku.dk> | 2007-06-02 21:59:49 +0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-06-02 23:07:44 +0400 |
| commit | 9b07873a52cc0243c2eddfac2e9c514152b96fb7 (patch) | |
| tree | a4cf2a23aca1f65bc34b2c50308792fb698be003 /git-rebase.sh | |
| parent | 86eff8c512b96ce3ee0ae5818edfa035b98cdf08 (diff) | |
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>
Diffstat (limited to 'git-rebase.sh')
| -rwxr-xr-x | git-rebase.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index 61770b5a28..2aa3a011db 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" |