]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 186b115) | patch
merge-ll: expose revision names to custom drivers
authorAntonin Delpeuch <antonin@delpeuch.eu>
Wed, 24 Jan 2024 20:09:11 +0000 (20:09 +0000)
committerJunio C Hamano <gitster@pobox.com>
Wed, 24 Jan 2024 21:15:06 +0000 (13:15 -0800)
commit81effe94682dbfed55171468074db85fa661cc21
treedf3b1a740b64d9dcb3c60330477f492c2373ad1atree | snapshot
parent186b115d3062e6230ee296d1ddaa0c4b72a464b5commit | diff
merge-ll: expose revision names to custom drivers

Custom merge drivers need access to the names of the revisions they
are working on, so that the merge conflict markers they introduce
can refer to those revisions. The placeholders '%S', '%X' and '%Y'
are introduced to this end.

Signed-off-by: Antonin Delpeuch <antonin@delpeuch.eu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/gitattributes.txt diff | blob | blame | history
merge-ll.c diff | blob | blame | history
t/t6406-merge-attr.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.