]> granicus.if.org Git - git/commitdiff
projects / git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d689301 09c2cb8)
Merge branch 'jc/merge-refuse-new-root'
authorJunio C Hamano <gitster@pobox.com>
Fri, 29 Apr 2016 19:59:08 +0000 (12:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 29 Apr 2016 19:59:08 +0000 (12:59 -0700)
"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

1  2 
builtin/pull.c patch | diff1 | diff2 | blob | history

diff --cc builtin/pull.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.