git.ipfire.org Git - thirdparty/git.git/commit

]> git.ipfire.org Git - thirdparty/git.git/commit

projects / thirdparty / git.git / commit

author	Junio C Hamano <gitster@pobox.com>
	Mon, 30 Aug 2021 23:06:01 +0000 (16:06 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Mon, 30 Aug 2021 23:06:01 +0000 (16:06 -0700)
commit	8778fa8b4f18a3930101825e5bcff62b5348e918
tree	309f07c553653f8f1c2c84b5b506ed47ee48a494	tree
parent	aca13c2355e7188432cb32aedf0bb0c477ec011a	commit \| diff
parent	f5a3c5e6377b806c320e4220ba26e467b4c4e992	commit \| diff

Merge branch 'en/ort-becomes-the-default'

Use `ort` instead of `recursive` as the default merge strategy.

* en/ort-becomes-the-default:
Update docs for change of default merge backend
Change default merge backend from recursive to ort

Documentation/merge-options.txt	diff1 \|	diff2 \|	blob \| history
builtin/merge.c	diff1 \|	diff2 \|	blob \| history
builtin/rebase.c	diff1 \|	diff2 \|	blob \| history
sequencer.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

Documentation/merge-options.txt	diff1 \|	diff2 \|	blob \| history
builtin/merge.c	diff1 \|	diff2 \|	blob \| history
builtin/rebase.c	diff1 \|	diff2 \|	blob \| history
sequencer.c	diff1 \|	diff2 \|	blob \| history