diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-07-09 15:25:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-09 15:25:37 -0700 |
| commit | 1b074e15d0f976be2bc14f9528874a841c055213 (patch) | |
| tree | a71a012782c2c47ec352f6ab64423a8a91a7f5b4 /mergetools/xxdiff | |
| parent | Merge branch 'ds/close-object-store' (diff) | |
| parent | add -p: fix checkout -p with pathological context (diff) | |
| download | tgif-1b074e15d0f976be2bc14f9528874a841c055213.tar.xz | |
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
Diffstat (limited to 'mergetools/xxdiff')
0 files changed, 0 insertions, 0 deletions