From: Junio C Hamano <gitster@pobox.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: git@vger.kernel.org, William Morgan <wmorgan-git@masanjin.net>
Subject: Re: [PATCH] additional help when editing during interactive rebase
Date: Tue, 08 Jan 2008 18:55:27 -0800 [thread overview]
Message-ID: <7vsl17pv1c.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <1199845915-sup-797@south> (William Morgan's message of "Tue, 08 Jan 2008 18:32:17 -0800")
William Morgan <wmorgan-git@masanjin.net> writes:
> I personally would have found this message useful the first time I used
> git rebase --interactive. YMMV.
Aside from this message being inappropriate as a proposed commit
log message, I think what the patch tries to achieve is a worthy
UI improvement.
I would have removed those empty lines around the instruction if
I were patching this, though. Losing 5 lines out of 25-line
terminal was marginally Ok. Losing 9 lines 4 lines too many and
is unacceptable.
Thoughts?
> Signed-off-by: William Morgan <wmorgan-git@masanjin.net>
> ---
> git-rebase--interactive.sh | 4 ++++
> 1 files changed, 4 insertions(+), 0 deletions(-)
>
> diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
> index acdcc54..d53d283 100755
> --- a/git-rebase--interactive.sh
> +++ b/git-rebase--interactive.sh
> @@ -263,6 +263,10 @@ do_next () {
> warn
> warn " git commit --amend"
> warn
> + warn "Once amended, continue with"
> + warn
> + warn " git rebase --continue"
> + warn
> exit 0
> ;;
> squash|s)
> --
> 1.5.4.rc2.68.ge708a-dirty
>
>
> --
> William <wmorgan-git@masanjin.net>
next prev parent reply other threads:[~2008-01-09 2:56 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 [this message]
2008-01-09 3:29 ` William Morgan
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=7vsl17pv1c.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=wmorgan-git@masanjin.net \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.