All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jonathan Nieder <jrnieder@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Martin Svensson <martin.k.svensson@netinsight.se>, git@vger.kernel.org
Subject: Re: cherry-pick -x formats the message incorrectly
Date: Tue, 16 Nov 2010 13:35:04 -0600	[thread overview]
Message-ID: <20101116193504.GB15828@burratino> (raw)
In-Reply-To: <7vpqu5gjmv.fsf@alter.siamese.dyndns.org>

Junio C Hamano wrote:
> Martin Svensson <martin.k.svensson@netinsight.se> writes:

>> It should be:
>>
>>   foo
>>   
>>   (cherry picked from commit eb42a6475d2c2e4fff7a1b626ce6e27eec21e886)
>>
>> Am I right?
>
> I tend to agree (modulo s/summary/subject/ would be the wording I would
> have used).
>
> This falls into "patches welcome" category, though.  I do not think
> anybody sane is still using cherry-pick with -x option these days after
> http://thread.gmane.org/gmane.comp.version-control.git/28378

Mm, I use it and do not agree; I think the rule should rather be:

 - if there is a Signed-off chain, quietly integrate into that (no added
   newline)

 - if there is not a Signed-off chain, add the extra newline.

Patch for a related issue in a few minutes.

  reply	other threads:[~2010-11-16 19:35 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-11-16  9:14 cherry-pick -x formats the message incorrectly Martin Svensson
2010-11-16 19:20 ` Junio C Hamano
2010-11-16 19:35   ` Jonathan Nieder [this message]
2010-11-16 21:34     ` Jonathan Nieder

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=20101116193504.GB15828@burratino \
    --to=jrnieder@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=martin.k.svensson@netinsight.se \
    /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.