projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c016814) | patch
fmt-merge-msg: use branch.$name.description
authorJunio C Hamano <gitster@pobox.com>
Fri, 7 Oct 2011 06:12:09 +0000 (23:12 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 7 Oct 2011 17:11:47 +0000 (10:11 -0700)
commit898eacd8ada2d012f977948350ed60845e238037
tree5d50d06cd00be020a74e1c14b52b3a10d6024a26tree | snapshot
parentc0168147831fce00975949213eef3471b7a2b76bcommit | diff
fmt-merge-msg: use branch.$name.description

This teaches "merge --log" and fmt-merge-msg to use branch description
information when merging a local topic branch into the mainline. The
description goes between the branch name label and the list of commit
titles.

The refactoring to share the common configuration parsing between
merge and fmt-merge-msg needs to be made into a separate patch.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Makefile diff | blob | history
builtin/fmt-merge-msg.c diff | blob | history
builtin/merge.c diff | blob | history
environment.c diff | blob | history
fmt-merge-msg.h [new file with mode: 0644] blob
Git—the stupid content tracker