projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1d7d6ad 69a8b7c)
Merge branch 'jk/maint-merge-msg-fix'
authorJunio C Hamano <gitster@pobox.com>
Sun, 16 Aug 2009 11:13:04 +0000 (04:13 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 16 Aug 2009 11:13:04 +0000 (04:13 -0700)
* 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

1  2 
builtin-merge.c patch | diff1 | diff2 | blob | history

diff --cc builtin-merge.c
Simple merge
Git—the stupid content tracker