Junio C Hamano 175008d454 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

2016-04-29 12:59:08 -07:00

26 KiB

Raw Blame History

View Raw