git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Avi Kivity <avi@qumranet.com>
Cc: gitster@pobox.com, git@vger.kernel.org
Subject: Re: [PATCH] rebase -i: support single-letter abbreviations for the actions
Date: Sat, 29 Sep 2007 21:58:09 +0100 (BST)	[thread overview]
Message-ID: <Pine.LNX.4.64.0709292156090.28395@racer.site> (raw)
In-Reply-To: <46FE7D0B.4060806@qumranet.com>

Hi,

On Sat, 29 Sep 2007, Avi Kivity wrote:

> Johannes Schindelin wrote:
> > When you do many rebases, you can get annoyed by having to type out 
> > the actions "edit" or "squash" in total.
> > 
> > This commit helps that, by allowing you to enter "e" instead of 
> > "edit", or "s" instead of "squash", and it also plays nice with 
> > "merge" or "amend" as synonyms to "squash".
> 
> Can we make "amend" like squash, except that it keeps the first commit's 
> authorship instead of the second?  I often merge a commit with some 
> minor fix that comes later, and usually want to keep the original author 
> record.

I do not necessarily think it is not doable, but I have different 
suggestion to you:

If you amend the commit with a minor fix that comes later, why not do 
"rebase -i" _before_ applying the fix, and then using "edit" on the 
respective commit?

That way you can even test the result easily, which you cannot do with 
"squash".

Ciao,
Dscho

  reply	other threads:[~2007-09-29 20:59 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-09-29  1:31 [PATCH] rebase -i: support single-letter abbreviations for the actions Johannes Schindelin
2007-09-29  2:12 ` Junio C Hamano
2007-09-29  2:32   ` [PATCH v2] " Johannes Schindelin
2007-09-29 16:27 ` [PATCH] " Avi Kivity
2007-09-29 20:58   ` Johannes Schindelin [this message]
2007-09-29 21:13     ` Avi Kivity
2007-09-29 21:48       ` Johannes Schindelin
2007-09-29 22:08         ` Junio C Hamano
2007-09-29 23:34           ` [PATCH] rebase -i: squash should retain the authorship of the _first_ commit 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=Pine.LNX.4.64.0709292156090.28395@racer.site \
    --to=johannes.schindelin@gmx.de \
    --cc=avi@qumranet.com \
    --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).