[PATCH] additional help when editing during interactive rebase
- From
- William Morgan <wmorgan-git@masanjin.net>
- Date
- Jan 9, 2008, 03:29 UTC
- Message-ID
- <1199849225-sup-6981@south>
- In-Reply-To
- <7vsl17pv1c.fsf@gitster.siamese.dyndns.org>
Let the user know how to continue a rebase after amending a commit during a git rebase --interactive session.
Signed-off-by: William Morgan <wmorgan@masanjin.net> --- git-rebase--interactive.sh | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index acdcc54..ccef1ac 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -258,11 +258,10 @@ do_next () { die_with_patch $sha1 "Could not apply $sha1... $rest" make_patch $sha1 : > "$DOTEST"/amend - warn warn "You can amend the commit now, with" - warn warn " git commit --amend" - warn + warn "Once amended, continue with" + warn " git rebase --continue" exit 0 ;; squash|s)
-- 1.5.4.rc2.69.g10f0 -- William <wmorgan-git@masanjin.net>