]> git.99rst.org Git - git.git/commit
git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 93177db)
sequencer: teach autostash apply to take optional conflict marker labels
authorHarald Nordgren <redacted>
Tue, 28 Apr 2026 18:39:10 +0000 (18:39 +0000)
committerJunio C Hamano <redacted>
Wed, 29 Apr 2026 12:46:03 +0000 (21:46 +0900)
commite1c8b2d4ece1ada17e818b8c1b0760a47c00cae9
treeae775571736a6e240e7a77f7beb204f2f65d9825tree
parent93177db652ce15533494033b1379b4e434cff364commit | diff
sequencer: teach autostash apply to take optional conflict marker labels

Add label_ours, label_theirs, label_base, and stash_msg parameters to
apply_autostash_ref() and the autostash apply machinery so callers can
pass custom conflict marker labels through to
"git stash apply --label-ours/--label-theirs/--label-base", as well as
a custom stash message for "git stash store -m".

Signed-off-by: Harald Nordgren <redacted>
Signed-off-by: Junio C Hamano <redacted>
builtin/commit.c diff | blob | history
builtin/merge.c diff | blob | history
sequencer.c diff | blob | history
sequencer.h diff | blob | history
git clone https://git.99rst.org/PROJECT