projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fc7ae9c 65969d4)
Merge branch 'js/maint-merge-use-prepare-commit-msg-hook'
authorJunio C Hamano <gitster@pobox.com>
Mon, 28 Feb 2011 05:58:30 +0000 (21:58 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 28 Feb 2011 05:58:30 +0000 (21:58 -0800)
* js/maint-merge-use-prepare-commit-msg-hook:
  merge: honor prepare-commit-msg hook

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

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