diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-08-26 12:05:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-26 12:05:57 -0700 |
| commit | bd30037e65c53112dd84c2712750e152b2f7f854 (patch) | |
| tree | 3f3f9700cddc32d13a25d76fe6eb86a11ee67c93 /commit.c | |
| parent | Merge branch 'jc/apply-epoch-patch' into maint (diff) | |
| parent | merge: indicate remote tracking branches in merge message (diff) | |
| download | git-bd30037e65c53112dd84c2712750e152b2f7f854.tar.gz git-bd30037e65c53112dd84c2712750e152b2f7f854.zip | |
Merge branch 'jk/maint-merge-msg-fix' into maint
* jk/maint-merge-msg-fix:
merge: indicate remote tracking branches in merge message
merge: fix incorrect merge message for ambiguous tag/branch
add tests for merge message headings
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions