]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6b37b3d 69a8b7c)
Merge branch 'jk/maint-merge-msg-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 26 Aug 2009 19:05:57 +0000 (12:05 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 26 Aug 2009 19:05:57 +0000 (12:05 -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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.