git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Kevin Ballard <kevin@sb.org>
Cc: "Pat Notz" <patnotz@gmail.com>,
	"git@vger.kernel.org" <git@vger.kernel.org>,
	"Carlos Martín Nieto" <cmn@elego.de>
Subject: Re: rebase autosquash doesn't recognise a chain of fixups
Date: Tue, 05 Apr 2011 14:03:12 -0700	[thread overview]
Message-ID: <7v8vvommwf.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <BANLkTimqvu7c559_AQ6yLxPACOxD0ciNxQ@mail.gmail.com> (Kevin Ballard's message of "Tue, 5 Apr 2011 11:59:23 -0700")

Kevin Ballard <kevin@sb.org> writes:

> On Tue, Apr 5, 2011 at 11:27 AM, Junio C Hamano <gitster@pobox.com> wrote:
>
>> Kevin Ballard <kevin@sb.org> writes:
>>
>> > This seems unnecessary. `git commit --fixup HEAD` doesn't really make any
>> sense at all to run when you can say `git commit --amend` instead,
>>
>> What about this sequence?
>>
>>        git commit -m 'foo'
>>        git commit -m 'bar'
>>        git commit --fixup HEAD~1
>>        git commit -m 'baz'
>>        git commit --fixup HEAD~1
>>
>>
> You raise a good point. I personally think someone who types that deserves
> what he gets, but I have no objection to being intelligent about duplicate
> fixup! prefixes.

Of course an alternative solution is to fix this on the "rebase -i" side,
by building on top of your d3d7a42 (rebase: better rearranging of
fixup!/squash! lines with --autosquash, 2010-11-04).

Or perhaps we would want to do both.

      parent reply	other threads:[~2011-04-05 21:04 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-04-05 15:41 rebase autosquash doesn't recognise a chain of fixups Carlos Martín Nieto
2011-04-05 15:48 ` Vincent van Ravesteijn
2011-04-05 16:03   ` Carlos Martín Nieto
2011-04-05 17:34 ` Junio C Hamano
2011-04-05 18:02   ` Kevin Ballard
2011-04-05 18:27     ` Junio C Hamano
     [not found]       ` <BANLkTimqvu7c559_AQ6yLxPACOxD0ciNxQ@mail.gmail.com>
2011-04-05 21:03         ` Junio C Hamano [this message]

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=7v8vvommwf.fsf@alter.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=cmn@elego.de \
    --cc=git@vger.kernel.org \
    --cc=kevin@sb.org \
    --cc=patnotz@gmail.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).