From: "Avery Pennarun" <apenwarr@gmail.com>
To: "Junio C Hamano" <gitster@pobox.com>
Cc: "Johannes Schindelin" <Johannes.Schindelin@gmx.de>, git@vger.kernel.org
Subject: Re: [PATCH] rebase -i: only automatically amend commit if HEAD did not change
Date: Wed, 23 Jul 2008 11:55:41 -0400 [thread overview]
Message-ID: <32541b130807230855y19bbedfah38dce9391ff4f481@mail.gmail.com> (raw)
In-Reply-To: <7viquxjwyf.fsf@gitster.siamese.dyndns.org>
On 7/22/08, Junio C Hamano <gitster@pobox.com> wrote:
> "Avery Pennarun" <apenwarr@gmail.com> writes:
> > Why doesn't "edit" just stage the commit and not auto-commit it at
> > all? That way an amend would *never* be necessary, and rebase
> > --continue would always do a commit -a (if there was anything left to
> > commit). The special case fixed by this patch would thus not be
> > needed.
>
> That would actually be in-line with the way how "rebase --skip" does the
> resetting without asking the user to do so, wouldn't it?
I'm not sure exactly what you mean, but I think with my proposed
change, "rebase --skip" would do "git reset --hard HEAD" while "rebase
--continue" would do "git commit -a", so it would be nice and
symmetrical, where currently it isn't exactly.
Have fun,
Avery
next prev parent reply other threads:[~2008-07-23 15:56 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-22 21:36 [PATCH] rebase -i: only automatically amend commit if HEAD did not change Johannes Schindelin
2008-07-22 21:48 ` Stephan Beyer
2008-07-22 22:22 ` Avery Pennarun
2008-07-22 23:55 ` Junio C Hamano
2008-07-23 15:55 ` Avery Pennarun [this message]
2008-07-23 12:01 ` Dmitry Potapov
2008-07-23 15:53 ` Avery Pennarun
2008-07-23 16:09 ` Johannes Schindelin
2008-07-23 16:19 ` Avery Pennarun
2008-07-23 23:41 ` Junio C Hamano
2008-07-24 12:20 ` Johannes Schindelin
2008-07-24 12:35 ` Stephan Beyer
2008-07-25 8:44 ` Junio C Hamano
2008-07-25 10:35 ` 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=32541b130807230855y19bbedfah38dce9391ff4f481@mail.gmail.com \
--to=apenwarr@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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;
as well as URLs for NNTP newsgroup(s).