]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'rt/commentchar-fmt-merge-msg'
authorJunio C Hamano <gitster@pobox.com>
Mon, 15 Apr 2013 19:40:56 +0000 (12:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 15 Apr 2013 19:40:56 +0000 (12:40 -0700)
The new core.commentchar configuration was not applied to a few
places.

* rt/commentchar-fmt-merge-msg:
  fmt-merge-msg: use core.commentchar in tag signatures completely
  fmt-merge-msg: respect core.commentchar in people credits

1  2 
builtin/fmt-merge-msg.c
t/t6200-fmt-merge-msg.sh

Simple merge
Simple merge