undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Jonas Fonseca 2007-06-02 19:59:49 +02:00 committed by Junio C Hamano
parent 86eff8c512
commit 9b07873a52
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git-rebase.sh
View File

@ -55,7 +55,7 @@ continue_merge () {
if test -n "$unmerged" if test -n "$unmerged"
then then
echo "You still have unmerged paths in your index" 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" die "$RESOLVEMSG"
fi fi
@ -126,7 +126,7 @@ do
--continue) --continue)
git-diff-files --quiet || { git-diff-files --quiet || {
echo "You must edit all merge conflicts and then" 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 exit 1
} }
if test -d "$dotest" if test -d "$dotest"