]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6affdbe 65969d4)
Merge branch 'js/maint-merge-use-prepare-commit-msg-hook' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 16 Mar 2011 23:47:25 +0000 (16:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 16 Mar 2011 23:47:25 +0000 (16:47 -0700)
* 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
Unnamed repository; edit this file 'description' to name the repository.