diff options
| author | Harald Nordgren <haraldnordgren@gmail.com> | 2026-04-28 18:39:10 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-04-29 21:46:03 +0900 |
| commit | e1c8b2d4ece1ada17e818b8c1b0760a47c00cae9 (patch) | |
| tree | ae775571736a6e240e7a77f7beb204f2f65d9825 /t/t4013/diff.format-patch_--stdout_initial..main^ | |
| parent | 93177db652ce15533494033b1379b4e434cff364 (diff) | |
| download | git-e1c8b2d4ece1ada17e818b8c1b0760a47c00cae9.tar.gz git-e1c8b2d4ece1ada17e818b8c1b0760a47c00cae9.zip | |
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 <haraldnordgren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4013/diff.format-patch_--stdout_initial..main^')
0 files changed, 0 insertions, 0 deletions