]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6320813) | patch
merge-strategies.txt: add coverage of the `ort` merge strategy
authorElijah Newren <newren@gmail.com>
Wed, 4 Aug 2021 23:50:53 +0000 (23:50 +0000)
committerJunio C Hamano <gitster@pobox.com>
Thu, 5 Aug 2021 15:57:40 +0000 (08:57 -0700)
commit67feccd3ba4566392774b8ed9492d7169031d4bb
tree1718ead5cb129e0db5096bf6152342c700b5686atree | snapshot
parent6320813bc0daf03f087072a498b5aaa8bbba36bdcommit | diff
merge-strategies.txt: add coverage of the `ort` merge strategy

Acked-by: Derrick Stolee <dstolee@microsoft.com>
Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/merge-strategies.txt diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.