git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
* cherry-pick merge commit with log message populated
@ 2019-08-01 19:49 Mateusz Loskot
  2019-08-01 20:24 ` Junio C Hamano
  0 siblings, 1 reply; 3+ messages in thread
From: Mateusz Loskot @ 2019-08-01 19:49 UTC (permalink / raw)
  To: git

Hi,

When cherry-picking a merge with `cherry-pick -x -m 1 <SHA>`,
is it possible to populate the log message with (short) log of all
commits that have been merged by the merge commit <SHA>?

The only workaround to copy the log messages along with
cherry-picked changes is to always merge copying all log
messages of intermediate commits into merge commit message
using `git merge --log feature1`.

Is there any other way, without remembering to `git merge` with `--log`?

Best regards,
-- 
Mateusz Loskot, http://mateusz.loskot.net

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: cherry-pick merge commit with log message populated
  2019-08-01 19:49 cherry-pick merge commit with log message populated Mateusz Loskot
@ 2019-08-01 20:24 ` Junio C Hamano
  2019-08-02 15:17   ` Mateusz Loskot
  0 siblings, 1 reply; 3+ messages in thread
From: Junio C Hamano @ 2019-08-01 20:24 UTC (permalink / raw)
  To: Mateusz Loskot; +Cc: git

Mateusz Loskot <mateusz@loskot.net> writes:

> Is there any other way, without remembering to `git merge` with `--log`?

"git config merge.log true"?

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: cherry-pick merge commit with log message populated
  2019-08-01 20:24 ` Junio C Hamano
@ 2019-08-02 15:17   ` Mateusz Loskot
  0 siblings, 0 replies; 3+ messages in thread
From: Mateusz Loskot @ 2019-08-02 15:17 UTC (permalink / raw)
  To: git

On 19-08-01 13:24:00, Junio C Hamano wrote:
>Mateusz Loskot <mateusz@loskot.net> writes:
>
>> Is there any other way, without remembering to `git merge` with `--log`?
>
>"git config merge.log true"?

That's sweet! Thank you

Best regards,
-- 
Mateusz Loskot, http://mateusz.loskot.net
Fingerprint=C081 EA1B 4AFB 7C19 38BA  9C88 928D 7C2A BB2A C1F2

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2019-08-02 15:17 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-01 19:49 cherry-pick merge commit with log message populated Mateusz Loskot
2019-08-01 20:24 ` Junio C Hamano
2019-08-02 15:17   ` Mateusz Loskot

Code repositories for project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).