Git development
 help / color / mirror / Atom feed
From: William Morgan <wmorgan-git@masanjin.net>
To: Git Mailing List <git@vger.kernel.org>
Subject: [PATCH] additional help when editing during interactive rebase
Date: Tue, 08 Jan 2008 19:29:01 -0800	[thread overview]
Message-ID: <1199849225-sup-6981@south> (raw)
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>

  reply	other threads:[~2008-01-09  3:30 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-01-09  2:32 [PATCH] additional help when editing during interactive rebase William Morgan
2008-01-09  2:55 ` Junio C Hamano
2008-01-09  3:29   ` William Morgan [this message]
2008-01-09 11:23   ` Johannes Schindelin
2008-01-11  8:42     ` Junio C Hamano
2008-01-11 11:29       ` Johannes Schindelin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1199849225-sup-6981@south \
    --to=wmorgan-git@masanjin.net \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox