-
Notifications
You must be signed in to change notification settings - Fork 140
stash/reset/checkout -p: optionally use the add --patch
backend written in pure C
#174
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
7416510
to
1a764b5
Compare
1a764b5
to
ba1e0c1
Compare
ba1e0c1
to
1a1cf8b
Compare
1a1cf8b
to
288a237
Compare
2b5d5c1
to
8c15904
Compare
074bb1c
to
d7ab0a3
Compare
d7ab0a3
to
3badec7
Compare
0de7b03
to
2e697ce
Compare
b5e30be
to
cb934d3
Compare
cb934d3
to
0d3b370
Compare
0d3b370
to
7a4c330
Compare
/submit |
Submitted as [email protected] |
This patch series was integrated into pu via git@96a9bb8. |
This patch series was integrated into next via git@a767b89. |
This patch series was integrated into pu via git@fcb2543. |
This patch series was integrated into pu via git@7b1a26c. |
This patch series was integrated into pu via git@c1da1bc. |
This patch series was integrated into pu via git@01d074e. |
This patch series was integrated into pu via git@2eccd3b. |
This patch series was integrated into pu via git@74090b1. |
This patch series was integrated into pu via git@2682869. |
This patch series was integrated into pu via git@db21dfb. |
This patch series was integrated into pu via git@1be1585. |
This patch series was integrated into pu via git@12c1bc5. |
This patch series was integrated into pu via git@c67036e. |
This patch series was integrated into pu via git@92323a0. |
This patch series was integrated into pu via git@76bc47e. |
This patch series was integrated into pu via git@4bff803. |
This patch series was integrated into pu via git@c68418f. |
This patch series was integrated into next via git@36f6756. |
This patch series was integrated into pu via git@3a45b3c. |
This patch series was integrated into pu via git@9a5315e. |
This patch series was integrated into next via git@9a5315e. |
This patch series was integrated into master via git@9a5315e. |
Closed via 9a5315e. |
At this stage on the journey to a fully built-in
git add
, we already have everything we need, including the--interactive
and--patch
options, as long as theadd.interactive.useBuiltin
setting is set totrue
. This config setting is kind of a feature flag that is currently turned off by default, and will be for a while, until we get confident enough that the built-in version does the job, and retire the Perl script.However, the internal
add--interactive
helper is also used to back the--patch
option ofgit stash
,git reset
,git checkout
andgit worktree
.This patch series (based on
js/add-p-in-c
) brings them "online".Changes since v1:
patch_mode_stage
topatch_mode_add
(andADD_P_STAGE
toADD_P_ADD
).diff
,apply
andapply_check
(that were inherited from the Perl script) todiff_cmd
,apply_args
andapply_check_args
, respectively.4
ofdiff_cmd
and friends.PROMPT_MODE_MAX
to make the array size ofprompt_mode
more obvious.= 0
initializers foris_reverse
.