merge: refuse to create too cool a merge by default
authorJunio C Hamano <gitster@pobox.com>
Fri, 18 Mar 2016 20:21:09 +0000 (13:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 23 Mar 2016 19:04:48 +0000 (12:04 -0700)
commite379fdf...4fee96cd205be83ff4e71699bdc32b18
tree7e0298e...b6478958a4e153f241248217545cf23ccopy hash to clipboard (tree)
parent937978e...f3e750d917768c77665d5f8cfbd802b6copy hash to clipboard (diff)
12 files changed:
Documentation/git-merge.txt
builtin/merge.c
t/t3033-merge-toplevel.sh
t/t3412-rebase-root.sh
t/t5500-fetch-pack.sh
t/t6009-rev-list-parent.sh
t/t6010-merge-base.sh
t/t6012-rev-list-simplify.sh
t/t6026-merge-attr.sh
t/t6029-merge-subtree.sh
t/t6101-rev-parse-parents.sh
t/t9400-git-cvsserver-server.sh