[PATCH] A more sensible error message why 'git rebase --continue' failed
From: Evan Phoenix <hidden>
Date: 2016-06-15 22:43:29
Subsystem:
the rest · Maintainer:
Linus Torvalds
The current message is a bit cryptic, indicating that only changes which contained merge conflicts should be added to the index, but in fact, all outstanding changes must be. The change could also incorporate a -i that prompts the user and performs 'git add -u' if they wish, allowing the rebase to properly continue. Signed-off-by: Evan Phoenix <redacted>
diff --git a/git-rebase.sh b/git-rebase.sh
index cbafa14..c67f29a 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh@@ -135,8 +135,12 @@ do case "$1" in --continue) git diff-files --quiet || { - echo "You must edit all merge conflicts and then" - echo "mark them as resolved using git add" + echo "Unable to continue rebase:" + echo " All modified files must be added to index first." + echo " Use 'git add' to resolve them and add them to the index." + echo + echo "Outstanding files:" + git diff-files --name-status exit 1 } if test -d "$dotest"
--
1.5.3.rc5.41.gc1c22