git.oblomov.eu Git - git/commit

author	Junio C Hamano <gitster@pobox.com>
	Mon, 29 Jul 2019 19:38:22 +0000 (12:38 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Mon, 29 Jul 2019 19:38:22 +0000 (12:38 -0700)
commit	689204ca8862a25be7bd7f91a42fbdf46cfb2a56
tree	3e889b66f7d0b4d43ceb072e17ac527807d5ac67	tree \| snapshot
parent	0324b6f035a19f0098c321a7e6e17c04e9405be2	commit \| diff
parent	2bd69b9024c8c7c1b77060e3ed996c74b4775b01	commit \| diff

Merge branch 'pw/add-p-recount' into maint

"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

git-add--interactive.perl	diff1 \|	diff2 \|	blob \| history
t/t3701-add-interactive.sh	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

git-add--interactive.perl	diff1 \|	diff2 \|	blob \| history
t/t3701-add-interactive.sh	diff1 \|	diff2 \|	blob \| history