summaryrefslogtreecommitdiff
path: root/trace.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-02-27 21:58:30 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-02-27 21:58:30 -0800
commit11e4b4fa49ff3221c9d07a877af6c73b619e9934 (patch)
tree6fc6a7f10b14013b6d8a57283fab93ceb3cfa355 /trace.c
parentMerge branch 'nd/hash-object-sanity' (diff)
parentmerge: honor prepare-commit-msg hook (diff)
downloadtgif-11e4b4fa49ff3221c9d07a877af6c73b619e9934.tar.xz
Merge branch 'js/maint-merge-use-prepare-commit-msg-hook'
* js/maint-merge-use-prepare-commit-msg-hook: merge: honor prepare-commit-msg hook
Diffstat (limited to 'trace.c')
0 files changed, 0 insertions, 0 deletions