From: Michael J Gruber <git@drmicha.warpmail.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Christoph Anton Mitterer <calestyo@scientia.net>
Subject: Re: [PATCH] sequencer: preserve commit messages
Date: Wed, 25 Feb 2015 10:50:47 +0100 [thread overview]
Message-ID: <54ED9AF7.6080908@drmicha.warpmail.net> (raw)
In-Reply-To: <xmqq8ufnrwm1.fsf@gitster.dls.corp.google.com>
Junio C Hamano venit, vidit, dixit 24.02.2015 19:29:
> Michael J Gruber <git@drmicha.warpmail.net> writes:
>
>>> Hmm, wouldn't it introduce a grave regression for users who
>>> explicitly ask to clean crufty messages up (by setting their own
>>> commit.cleanup configuration) if you unconditionally force
>>> "--cleanup=verbatim" here?
>>>
>>
>> That's what I meant by possible side-effects below.
>> ...
>> But git cherry-pick without conflict should no re-cleanup the commit
>> message either, should it?
>
> Hmm, but if it does not, wouldn't that countermand the wish of the
> user who explicitly asked to clean crufty messages up by setting
> their own commit.cleanup configuration?
>
Note that "verbatim" is not the default - we cleanup commits even
without being asked to. And this makes sense for "git commit", of course.
I myself certainly expected "git cherry-pick" to transfer a commit as
verbatim as possible. "git rebase" preserves the commit message (at
least more than cherry-pick). What's the difference between them?
Technically the difference between commit-tree and commit, sure, but for
the user?
Michael
next prev parent reply other threads:[~2015-02-25 9:51 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-21 17:48 [BUG] git mangles up commit messages on rebase Christoph Anton Mitterer
2015-02-23 13:23 ` [PATCH] sequencer: preserve commit messages Michael J Gruber
2015-02-23 18:54 ` Junio C Hamano
2015-02-24 15:29 ` Michael J Gruber
2015-02-24 18:29 ` Junio C Hamano
2015-02-25 9:50 ` Michael J Gruber [this message]
2015-02-25 18:22 ` Junio C Hamano
2015-02-26 11:05 ` Michael J Gruber
2015-02-26 19:49 ` Junio C Hamano
2015-02-27 15:31 ` Michael J Gruber
2015-02-27 18:31 ` Junio C Hamano
2015-03-06 13:55 ` [PATCHv2] " Michael J Gruber
2015-03-06 18:59 ` Junio C Hamano
2015-02-25 13:44 ` [PATCH] " Christoph Anton Mitterer
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=54ED9AF7.6080908@drmicha.warpmail.net \
--to=git@drmicha.warpmail.net \
--cc=calestyo@scientia.net \
--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).