diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-04-26 11:10:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-26 11:10:47 -0700 |
| commit | 0222bc91022cdd6f6b87afb4d01bbac964d05702 (patch) | |
| tree | 373d604e149c97e312ddc620e2d2df639cc6590d /Documentation/git-merge-index.txt | |
| parent | Merge branch 'rs/empty-archive' into maint (diff) | |
| parent | t6200: avoid path mangling issue on Windows (diff) | |
| download | tgif-0222bc91022cdd6f6b87afb4d01bbac964d05702.tar.xz | |
Merge branch 'rt/commentchar-fmt-merge-msg' into maint
* rt/commentchar-fmt-merge-msg:
t6200: avoid path mangling issue on Windows
fmt-merge-msg: use core.commentchar in tag signatures completely
fmt-merge-msg: respect core.commentchar in people credits
Diffstat (limited to 'Documentation/git-merge-index.txt')
0 files changed, 0 insertions, 0 deletions