pull: pass --allow-unrelated-histories to "git merge"
authorJunio C Hamano <gitster@pobox.com>
Fri, 18 Mar 2016 20:21:09 +0000 (13:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 21 Apr 2016 18:58:51 +0000 (11:58 -0700)
commit09c2cb8...7a9cc0f6f25eac8d43663f4e8f3309a4
tree0e1a2e1...3c79237d21c8912c6af9c92b65bf8815copy hash to clipboard (tree)
parentde22496...148c6b32ea2a6eba85578cc16d6c86c1copy hash to clipboard (diff)
Documentation/git-merge.txt
Documentation/merge-options.txt
builtin/pull.c
t/t5521-pull-options.sh