[PATCH] git-rebase: suggest to use git-add instead of git-update-index
From: Jonas Fonseca <hidden>
Date: 2016-06-15 22:43:13
Subsystem:
the rest · Maintainer:
Linus Torvalds
The command is part of the main porcelain making git-add more appropriate. Signed-off-by: Jonas Fonseca <redacted> --- git-rebase.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) I don't know if this is good or not, maybe it is a matter of taste, but as a new git user I prefer to use git add.
diff --git a/git-rebase.sh b/git-rebase.sh
index 61770b5..2aa3a01 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"
--
1.5.2.816.gc5560-dirty
--
Jonas Fonseca