| commit | 175008d45474ff78ca9e3dcf038df359a97b4d92 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 29 Apr 2016 19:59:08 +0000 (29 12:59 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 29 Apr 2016 19:59:08 +0000 (29 12:59 -0700) | ||
| tree | 7dc4add353d353d40a49a1c440d186e4c134cd07 | treesnapshot (tar.gz zip) |
| parent | d689301043f6dc14d71e7d33e1b8ea600ae1b67b | commitdiff |
| parent | 09c2cb877a9cc0f6f25eac8d43663f4e8f3309a4 | commitdiff |
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
"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
| builtin/pull.c | diff1 | diff2 | blobhistory |