Kevux Git Server - rit/commit

]> Kevux Git Server - rit/commit

author	Elijah Newren <newren@gmail.com>
	Wed, 4 Aug 2021 05:38:02 +0000 (05:38 +0000)
committer	Junio C Hamano <gitster@pobox.com>
	Thu, 5 Aug 2021 22:35:02 +0000 (15:35 -0700)
commit	f5a3c5e6377b806c320e4220ba26e467b4c4e992
tree	05ac0b4680ea0a353503b299c8b1bbf9a3585ae1	tree \| snapshot
parent	6a5fb966720fffaae28bbd9408c55414c3b8c813	commit \| diff

Update docs for change of default merge backend

Make it clear that `ort` is the default merge strategy now rather than
`recursive`, including moving `ort` to the front of the list of merge
strategies.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Git without Rust.

RSS Atom

Documentation/git-rebase.txt		diff \| blob \| history
Documentation/gitfaq.txt		diff \| blob \| history
Documentation/merge-options.txt		diff \| blob \| history
Documentation/merge-strategies.txt		diff \| blob \| history
Documentation/user-manual.txt		diff \| blob \| history