Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
rebase -i: suggest using --edit-todo to fix an unknown instruction
author
Johannes Sixt
<j6t@kdbg.org>
Wed, 19 Sep 2012 06:43:54 +0000
(08:43 +0200)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 19 Sep 2012 19:52:10 +0000
(12:52 -0700)
We have now an explicit UI to edit the todo sheet and need not disclose
the name of the file.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-rebase--interactive.sh
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
9f4981b
)
diff --git
a/git-rebase--interactive.sh
b/git-rebase--interactive.sh
index 2b8f2a9f42a1ddaa3252ee57aff650c41621491f..4b2ef11e59d465cf745714ebb917525eb74fe4e0 100644
(file)
--- a/
git-rebase--interactive.sh
+++ b/
git-rebase--interactive.sh
@@
-575,11
+575,12
@@
do_next () {
;;
*)
warn "Unknown command: $command $sha1 $rest"
+ fixtodo="Please fix this using 'git rebase --edit-todo'."
if git rev-parse --verify -q "$sha1" >/dev/null
then
- die_with_patch $sha1 "
Please fix this in the file $todo.
"
+ die_with_patch $sha1 "
$fixtodo
"
else
- die "
Please fix this in the file $todo.
"
+ die "
$fixtodo
"
fi
;;
esac