]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit11e4b4fa49ff3221c9d07a877af6c73b619e9934
tree6fc6a7f10b14013b6d8a57283fab93ceb3cfa355tree | snapshot
parentfc7ae9c156775cc9679c0bcc7156abb7dba1bd3acommit | diff
parent65969d43d10512a44f5e7248e4404b946d1d0d9fcommit | diff
Merge branch 'js/maint-merge-use-prepare-commit-msg-hook'

* 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.