]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b15384c) | patch
stash: add --label-ours, --label-theirs, --label-base for apply
authorHarald Nordgren <haraldnordgren@gmail.com>
Tue, 28 Apr 2026 18:39:08 +0000 (18:39 +0000)
committerJunio C Hamano <gitster@pobox.com>
Wed, 29 Apr 2026 12:46:02 +0000 (21:46 +0900)
commit13817db2746d48b6d3cfe68e3bf10a1be67865a9
tree166e9ecbb0382ccbb7705cfaa8b008dc99432166tree | snapshot
parentb15384c06f77bc2d34d0d3623a8a58218313a561commit | diff
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>
Documentation/git-stash.adoc diff | blob | blame | history
builtin/stash.c diff | blob | blame | history
t/t3903-stash.sh diff | blob | blame | history
xdiff/xmerge.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.