summaryrefslogtreecommitdiff
path: root/xdiff
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2019-12-21 21:57:12 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-12-21 16:06:21 -0800
commit90a6bb98d11a664f729dbb86c90d9c7a38ea825a (patch)
tree48d3d5ce4f9499176010e327a84c26c1bfc3d9ff /xdiff
parentbuilt-in add -p: implement the "stash" and "reset" patch modes (diff)
downloadtgif-90a6bb98d11a664f729dbb86c90d9c7a38ea825a.tar.xz
legacy stash -p: respect the add.interactive.usebuiltin setting
As `git add` traditionally did not expose the `--patch=<mode>` modes via command-line options, the scripted version of `git stash` had to call `git add--interactive` directly. But this prevents the built-in `add -p` from kicking in, as `add--interactive` is the scripted version (which does not have a "fall-back" to the built-in version). So let's introduce support for internal switch for `git add` that the scripted `git stash` can use to call the appropriate backend (scripted or built-in, depending on `add.interactive.useBuiltin`). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff')
0 files changed, 0 insertions, 0 deletions