]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'dl/checkout-p-merge-base'
authorJunio C Hamano <gitster@pobox.com>
Tue, 27 Oct 2020 22:09:50 +0000 (15:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 27 Oct 2020 22:09:51 +0000 (15:09 -0700)
"git checkout -p A...B [-- <path>]" did not work, even though the
same command without "-p" correctly used the merge-base between
commits A and B.

* dl/checkout-p-merge-base:
  t2016: add a NEEDSWORK about the PERL prerequisite
  add-patch: add NEEDSWORK about comparing commits
  Doc: document "A...B" form for <tree-ish> in checkout and switch
  builtin/checkout: fix `git checkout -p HEAD...` bug

1  2 
Documentation/git-checkout.txt
add-patch.c
builtin/checkout.c
git-add--interactive.perl

Simple merge
diff --cc add-patch.c
Simple merge
Simple merge
Simple merge