Harald Nordgren 09a43fe49f 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>

2026-04-12 15:11:39 -07:00

..

xdiff.h

xdiff: add 'minimal' to XDF_DIFF_ALGORITHM_MASK

2025-11-17 09:31:59 -08:00

xdiffi.c

Merge branch 'yc/histogram-hunk-shift-fix'

2026-03-24 12:31:34 -07:00

xdiffi.h

xdiff: delete struct diffdata_t

2025-09-30 14:12:46 -07:00

xemit.c

xdiff: make xdfile_t.nrec a size_t instead of long

2025-11-18 14:53:10 -08:00

xemit.h

…

xhistogram.c

xdiff: split xrecord_t.ha into line_hash and minimal_perfect_hash

2025-11-18 14:53:10 -08:00

xinclude.h

…

xmacros.h

…

xmerge.c

stash: add --label-ours, --label-theirs, --label-base for apply

2026-04-12 15:11:39 -07:00

xpatience.c

diff --anchored: avoid checking unmatched lines

2026-02-12 09:28:49 -08:00

xprepare.c

xdiff: remove unused data from xdlclass_t

2026-01-26 08:38:29 -08:00

xprepare.h

…

xtypes.h

xdiff: remove "line_hash" field from xrecord_t

2026-01-26 08:38:29 -08:00

xutils.c

xdiff: use unambiguous types in xdl_hash_record()

2025-11-18 14:53:10 -08:00

xutils.h

xdiff: use unambiguous types in xdl_hash_record()

2025-11-18 14:53:10 -08:00