Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Prompt to continue when editing during rebase --interactive
author
Jonathan del Strother
<maillist@steelskies.com>
Wed, 27 Feb 2008 12:50:22 +0000
(12:50 +0000)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 27 Feb 2008 19:23:22 +0000
(11:23 -0800)
On hitting an edit point in an interactive rebase, git should prompt
the user to run "git rebase --continue"
Signed-off-by: Jonathan del Strother <jon.delStrother@bestbefore.tv>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-rebase--interactive.sh
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
a50a5c8
)
diff --git
a/git-rebase--interactive.sh
b/git-rebase--interactive.sh
index fb12b03b201836bb4c3b43a5d1120b3305d1ccf0..c2bedd622c7238359ab88592857bb50eeaa568f8 100755
(executable)
--- a/
git-rebase--interactive.sh
+++ b/
git-rebase--interactive.sh
@@
-268,6
+268,10
@@
do_next () {
warn
warn " git commit --amend"
warn
+ warn "Once you are satisfied with your changes, run"
+ warn
+ warn " git rebase --continue"
+ warn
exit 0
;;
squash|s)