diff options
| author | Harald Nordgren <haraldnordgren@gmail.com> | 2026-04-28 18:39:08 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-04-29 21:46:02 +0900 |
| commit | 13817db2746d48b6d3cfe68e3bf10a1be67865a9 (patch) | |
| tree | 166e9ecbb0382ccbb7705cfaa8b008dc99432166 /t/t4013/diff.diff-tree_initial | |
| parent | b15384c06f77bc2d34d0d3623a8a58218313a561 (diff) | |
| download | git-13817db2746d48b6d3cfe68e3bf10a1be67865a9.tar.gz git-13817db2746d48b6d3cfe68e3bf10a1be67865a9.zip | |
stash: add --label-ours, --label-theirs, --label-base for apply
Allow callers of "git stash apply" to pass custom labels for conflict
markers instead of the default "Updated upstream" and "Stashed changes".
Document the new options and add a test.
Signed-off-by: Harald Nordgren <haraldnordgren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4013/diff.diff-tree_initial')
0 files changed, 0 insertions, 0 deletions