]> git.tokkee.org Git - git.git/commitdiff
[tokkee]

tokkee.org

Code

projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b0578c9 f23101b)
Merge branch 'jc/merge-reword'
authorJunio C Hamano <gitster@pobox.com>
Thu, 25 Aug 2011 23:00:53 +0000 (16:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 25 Aug 2011 23:00:53 +0000 (16:00 -0700)
* jc/merge-reword:
  merge: reword the final message

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

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