diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-12-21 21:57:14 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-12-22 00:06:22 (GMT) |
| commit | 52628f94fc35f57f0b3c54e4f849e490bfa44449 (patch) | |
| tree | cd1bf248d529e9f6e609b1cf3c1c985cbe7bd2c0 /add-interactive.h | |
| parent | 6610e4628ac12396efc20201fe85d67591bed247 (diff) | |
| download | git-52628f94fc35f57f0b3c54e4f849e490bfa44449.zip git-52628f94fc35f57f0b3c54e4f849e490bfa44449.tar.gz git-52628f94fc35f57f0b3c54e4f849e490bfa44449.tar.bz2 | |
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 'add-interactive.h')
| -rw-r--r-- | add-interactive.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/add-interactive.h b/add-interactive.h index 1f6a613..77907f6 100644 --- a/add-interactive.h +++ b/add-interactive.h @@ -27,6 +27,7 @@ enum add_p_mode { ADD_P_ADD, ADD_P_STASH, ADD_P_RESET, + ADD_P_CHECKOUT, }; int run_add_p(struct repository *r, enum add_p_mode mode, |