summaryrefslogtreecommitdiff
path: root/t/t2010-checkout-ambiguous.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-09-29 11:23:42 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-09-29 11:23:42 +0900
commitd4d262d19e118faf29df842b752144da7c7af02e (patch)
tree838ced9237391f172b84f664d2b76094cd3b2bd7 /t/t2010-checkout-ambiguous.sh
parentMerge branch 'jt/fast-export-copy-modify-fix' (diff)
parentDocumentation/githooks: mention merge in commit-msg hook (diff)
downloadtgif-d4d262d19e118faf29df842b752144da7c7af02e.tar.xz
Merge branch 'sb/merge-commit-msg-hook'
As "git commit" to conclude a conflicted "git merge" honors the commit-msg hook, "git merge" that records a merge commit that cleanly auto-merges should, but it didn't. * sb/merge-commit-msg-hook (2017-09-22) 1 commit (merged to 'next' on 2017-09-25 at 096e0502a8) + Documentation/githooks: mention merge in commit-msg hook Add documentation for a topic that has recently graduated to the 'master' branch. * sb/merge-commit-msg-hook: Documentation/githooks: mention merge in commit-msg hook
Diffstat (limited to 't/t2010-checkout-ambiguous.sh')
0 files changed, 0 insertions, 0 deletions