Merge branch 'jc/merge-refuse-new-root'

"git pull" has been taught to pass --allow-unrelated-histories
option to underlying "git merge".

* jc/merge-refuse-new-root:
pull: pass --allow-unrelated-histories to "git merge"
t3033: avoid 'ambiguous refs' warning

diff --cc builtin/pull.c
Simple merge