]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: bcb6cae) | patch
merge-tree: add -X strategy option
authorTang Yuyi <winglovet@gmail.com>
Sun, 24 Sep 2023 02:23:42 +0000 (02:23 +0000)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Sep 2023 21:37:42 +0000 (14:37 -0700)
commit6a4c9e7b32c4154345785bd7b8d4afee5fddcead
treeb15f3236e6ea55eede80abe34ca9b171ca2a3e28tree
parentbcb6cae2966cc407ca1afc77413b3ef11103c175commit | diff
merge-tree: add -X strategy option

Add merge strategy option to produce more customizable merge result such
as automatically resolving conflicts.

Signed-off-by: Tang Yuyi <winglovet@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/merge-tree.c diff | blob | blame | history
t/t4301-merge-tree-write-tree.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.