summaryrefslogtreecommitdiff
path: root/trailer.c
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2019-12-21 21:57:14 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-12-21 16:06:22 -0800
commit52628f94fc35f57f0b3c54e4f849e490bfa44449 (patch)
treecd1bf248d529e9f6e609b1cf3c1c985cbe7bd2c0 /trailer.c
parentbuilt-in stash: use the built-in `git add -p` if so configured (diff)
downloadtgif-52628f94fc35f57f0b3c54e4f849e490bfa44449.tar.xz
built-in add -p: implement the "checkout" patch modes
This patch teaches the built-in `git add -p` machinery all the tricks it needs to know in order to act as the work horse for `git checkout -p`. Apart from the minor changes (slightly reworded messages, different `diff` and `apply --check` invocations), it requires a new function to actually apply the changes, as `git checkout -p` is a bit special in that respect: when the desired changes do not apply to the index, but apply to the work tree, Git does not fail straight away, but asks the user whether to apply the changes to the worktree at least. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'trailer.c')
0 files changed, 0 insertions, 0 deletions