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>
This commit is contained in:
Jonas Fonseca 2007-06-02 19:59:49 +02:00 коммит произвёл Junio C Hamano
Родитель 86eff8c512
Коммит 9b07873a52
1 изменённых файлов: 2 добавлений и 2 удалений

Просмотреть файл

@ -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"