Re: [PATCH] rebase -i: fixup fixup! fixup!

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 25, 2013, 21:33 UTC
Message-ID: <7vehbp27vl.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1372190294-sup-1398@pimlott.net>

Andrew Pimlott <andrew@pimlott.net> writes:

Just reponding for the "procedual" part for now.

> So if I don't want to break the discussion, should I append the unedited
> format-patch output to my message after "scissors", or should I send it
> as a whole new message with --in-reply-to?  Or something else?  I'll try
> the first.

Which is fine, and you are almost there, but you do not want

 (1) "From 99023b..." that is not part of the message (it is a
     delimiter between multiple patches when/in case a file contains
     more than one);

 (2) "From: Andrew..." that is the same as the e-mail header in the
     message I am responding to;

 (3) "Date: ..." which is older than the e-mail header in the
     message I am responding to---the latter is the date people
     actually saw this patch on the mailing list, so it is
     preferrable to use it than the timestamp in your repository.

So in this case, I'd expect to see, after the "-- >8 --" line, only "Subject: " line, a blank and the log message.

Show 8 quoted lines

>
> ---8<---
> From 99023bff23f18a341441d6b7c447d9630a11b489 Mon Sep 17 00:00:00 2001
> From: Andrew Pimlott <andrew@pimlott.net>
> Date: Fri, 14 Jun 2013 10:33:16 -0700
> Subject: [PATCH 1/4] rebase -i: handle fixup! fixup! in --autosquash
>
> In rebase -i --autosquash, ignore all "fixup! " or "squash! " after the