projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit5b8aac32fbf5be49e2cdfbdb082fa6bca9548d24
tree36d150c5b966cbfc9f06e6d2a67554e6aafb4a84tree | snapshot
parent6affdbe677c4b2b8547bd9aa471464dd31a94a1ccommit | diff
parent65969d43d10512a44f5e7248e4404b946d1d0d9fcommit | diff
Merge branch 'js/maint-merge-use-prepare-commit-msg-hook' into maint

* js/maint-merge-use-prepare-commit-msg-hook:
  merge: honor prepare-commit-msg hook
builtin/merge.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.