When the index is unchanged during a rebase conflict resolution,
prompt the user to "git add", or alternatively drop the patch using
"git rebase --skip".
Noticed-by: Dale Rowley <ddrowley@xxxxxxxxx>
Signed-off-by: Ramkumar Ramachandra <artagnon@xxxxxxxxx>
---
git-am.sh | 4 +++-
git-rebase.sh | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/git-am.sh b/git-am.sh
index 87ffae2..3c46f60 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -725,7 +725,9 @@ do
# working tree.
resolved=
git diff-index --quiet --cached HEAD -- && {
- echo "No changes - did you forget to use 'git add'?"
+ echo "No changes - did you forget to use 'git add'? " \
+ "If you dropped the changes introduced by the patch, " \
+ "you should use \"$cmdline --skip\"."
stop_here_user_resolve $this
}
unmerged=$(git ls-files -u)
diff --git a/git-rebase.sh b/git-rebase.sh
index 44f5c65..60cc0e9 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -217,8 +217,8 @@ do
die "No rebase in progress?"
git diff-files --quiet --ignore-submodules || {
- echo "You must edit all merge conflicts and then"
- echo "mark them as resolved using git add"
+ echo "You must edit all merge conflicts and then" \
+ "mark them as resolved using 'git add'"
exit 1
}
if test -d "$dotest"
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html