summaryrefslogtreecommitdiff
path: root/t/t5515/fetch.br-remote-explicit-merge
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-10-06 23:12:09 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-10-07 10:11:47 -0700
commit898eacd8ada2d012f977948350ed60845e238037 (patch)
tree5d50d06cd00be020a74e1c14b52b3a10d6024a26 /t/t5515/fetch.br-remote-explicit-merge
parentrequest-pull: use the branch description (diff)
downloadtgif-898eacd8ada2d012f977948350ed60845e238037.tar.xz
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>
Diffstat (limited to 't/t5515/fetch.br-remote-explicit-merge')
0 files changed, 0 insertions, 0 deletions