All of lore.kernel.org
 help / color / mirror / Atom feed
From: Andrew Pimlott <andrew@pimlott.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Thomas Rast <trast@inf.ethz.ch>, git <git@vger.kernel.org>
Subject: Re: [PATCH] rebase -i: fixup fixup! fixup!
Date: Tue, 25 Jun 2013 16:17:46 -0700	[thread overview]
Message-ID: <1372201438-sup-833@pimlott.net> (raw)
In-Reply-To: <7vehbp27vl.fsf@alter.siamese.dyndns.org>

Excerpts from Junio C Hamano's message of Tue Jun 25 14:33:18 -0700 2013:
> 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.

Thank you.  It was not clear to me even after several doc readings what
git-mailinfo would look for where.  I think I assumed that the idea was
to transmit the original commit perfectly, and I stubbornly failed to
give up that assumption even when it clearly didn't fit.  Everything
makes more sense with the understanding that the receiver will pull
together non-patch metadata in the way that makes sense from his point
of view (and that a different commit will come back via fetch).  I will
take a whack at clarifying the docs if I have time.

Andrew

  reply	other threads:[~2013-06-25 23:17 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-11 18:05 rebase --autosquash does not handle fixup! of fixup! Andrew Pimlott
2013-06-11 18:50 ` Thomas Rast
2013-06-14 19:31   ` [PATCH] rebase -i: fixup fixup! fixup! Andrew Pimlott
2013-06-15  6:50     ` Andrew Pimlott
2013-06-15 10:07       ` Junio C Hamano
2013-06-16  1:19         ` Junio C Hamano
2013-06-16 11:08         ` Thomas Rast
2013-06-17  2:38           ` Junio C Hamano
2013-06-17  8:07             ` Thomas Rast
2013-06-17 14:27               ` Junio C Hamano
2013-06-25 20:41                 ` Andrew Pimlott
2013-06-25 21:33                   ` Junio C Hamano
2013-06-25 23:17                     ` Andrew Pimlott [this message]
2013-06-25 21:36                   ` Junio C Hamano
2013-06-25 21:45                   ` Junio C Hamano
2013-06-25 22:01                     ` Junio C Hamano
2013-06-25 23:03                     ` Andrew Pimlott
2013-06-26 22:00                       ` Andrew Pimlott
2013-06-26 23:48                         ` Junio C Hamano
2013-06-27  0:20                           ` Andrew Pimlott
2013-06-27 19:26                             ` Andrew Pimlott
2013-06-27 20:52                               ` Junio C Hamano
2013-06-28 14:20                                 ` Andrew Pimlott

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=1372201438-sup-833@pimlott.net \
    --to=andrew@pimlott.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=trast@inf.ethz.ch \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.