git.oblomov.eu Git - git/commit

author	Junio C Hamano <gitster@pobox.com>
	Tue, 9 Jul 2019 22:25:37 +0000 (15:25 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Tue, 9 Jul 2019 22:25:37 +0000 (15:25 -0700)
commit	1b074e15d0f976be2bc14f9528874a841c055213
tree	a71a012782c2c47ec352f6ab64423a8a91a7f5b4	tree \| snapshot
parent	5cb7c73589059b557f0d690ed6bcfde46ef2d234	commit \| diff
parent	2bd69b9024c8c7c1b77060e3ed996c74b4775b01	commit \| diff

Merge branch 'pw/add-p-recount'

"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