diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-02-05 14:34:58 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-02-05 14:34:58 -0800 |
| commit | 9a5315edfdf662c4d9bf444ebc297bc802fa5e04 (patch) | |
| tree | f5a719c28ba9445bd857be710a1955c5c4883634 /git-legacy-stash.sh | |
| parent | 381e8e9de142b636e4a25b6df113d70168e21a34 (diff) | |
| parent | c480eeb574e649a19f27dc09a994e45f9b2c2622 (diff) | |
| download | git-9a5315edfdf662c4d9bf444ebc297bc802fa5e04.tar.gz | |
Merge branch 'js/patch-mode-in-others-in-c'
The effort to move "git-add--interactive" to C continues.
* js/patch-mode-in-others-in-c:
commit --interactive: make it work with the built-in `add -i`
built-in add -p: implement the "worktree" patch modes
built-in add -p: implement the "checkout" patch modes
built-in stash: use the built-in `git add -p` if so configured
legacy stash -p: respect the add.interactive.usebuiltin setting
built-in add -p: implement the "stash" and "reset" patch modes
built-in add -p: prepare for patch modes other than "stage"
Diffstat (limited to 'git-legacy-stash.sh')
| -rwxr-xr-x | git-legacy-stash.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-legacy-stash.sh b/git-legacy-stash.sh index 53fa574301..4d4ebb4f2b 100755 --- a/git-legacy-stash.sh +++ b/git-legacy-stash.sh @@ -207,7 +207,7 @@ create_stash () { # find out what the user wants GIT_INDEX_FILE="$TMP-index" \ - git add--interactive --patch=stash -- "$@" && + git add --legacy-stash-p -- "$@" && # state of the working tree w_tree=$(GIT_INDEX_FILE="$TMP-index" git write-tree) || |