Andrew's git / gitweb.git / diff
?
Merge branch 'pw/add-p-recount' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 29 Jul 2019 19:38:22 +0000 (12:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 Jul 2019 19:38:22 +0000 (12:38 -0700)
"git checkout -p" needs to selectively apply a patch in reverse,
which did not work well.

* pw/add-p-recount:
add -p: fix checkout -p with pathological context

1  2 
git-add--interactive.perl patch | diff1 | diff2 | blob | history
t/t3701-add-interactive.sh patch | diff1 | diff2 | blob | history
diff --cc git-add--interactive.perl
Simple merge
diff --cc t/t3701-add-interactive.sh
Simple merge