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

git@vger.kernel.org list mirror (unofficial, one of many)

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://public-inbox.org/git
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 git git/ https://public-inbox.org/git \
		git@vger.kernel.org
	public-inbox-index git

Example config snippet for mirrors.
Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.version-control.git
	nntp://7fh6tueqddpjyxjmgtdiueylzoqt6pt7hec3pukyptlmohoowvhde4yd.onion/inbox.comp.version-control.git
	nntp://ie5yzdi7fg72h7s4sdcztq5evakq23rdt33mfyfcddc5u3ndnw24ogqd.onion/inbox.comp.version-control.git
	nntp://4uok3hntl7oi7b4uf4rtfwefqeexfzil2w6kgk2jn5z2f764irre7byd.onion/inbox.comp.version-control.git
	nntp://news.gmane.io/gmane.comp.version-control.git
 note: .onion URLs require Tor: https://www.torproject.org/

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

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

AGPL code for this site: git clone https://public-inbox.org/public-inbox.git