From: "Avery Pennarun" <apenwarr@gmail.com>
To: "Johannes Schindelin" <Johannes.Schindelin@gmx.de>
Cc: git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCH] rebase -i: only automatically amend commit if HEAD did not change
Date: Tue, 22 Jul 2008 18:22:34 -0400 [thread overview]
Message-ID: <32541b130807221522r2a43c49cl6400f00dbe7451a0@mail.gmail.com> (raw)
In-Reply-To: <alpine.DEB.1.00.0807222235520.8986@racer>
On 7/22/08, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> If the user called "rebase -i", marked a commit as "edit", "rebase
> --continue" would automatically amend the commit when there were
> staged changes.
>
> However, this is actively wrong when the current commit is not the
> one marked with "edit". So guard against this.
This patch is perhaps a symptom of something I've been meaning to ask
about for a while.
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.
It would also make it more obvious how to remove files from a commit,
for example, without having to learn about "git reset". For that
matter, you wouldn't have to learn about "git commit --amend" either,
and it would save typing.
It would also be a little more consistent with "squash", which already
lets you edit the commit message by default.
Just a thought. Presumably it was implemented the way it is for some
reason, but I haven't seen any discussion about it.
Have fun,
Avery
next prev parent reply other threads:[~2008-07-22 22:23 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 [this message]
2008-07-22 23:55 ` Junio C Hamano
2008-07-23 15:55 ` Avery Pennarun
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=32541b130807221522r2a43c49cl6400f00dbe7451a0@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).