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

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

author	Junio C Hamano <gitster@pobox.com>
	Fri, 21 Feb 2025 18:35:53 +0000 (10:35 -0800)
committer	Junio C Hamano <gitster@pobox.com>
	Fri, 21 Feb 2025 18:35:53 +0000 (10:35 -0800)
commit	55b5ba87f1ce7ef5c9f891392a7271bfc4d62d2b
tree	017d59811768d0da557ad46e196bd6448ef05add	tree \| snapshot
parent	ee8020ff40dd3b9b472b482bfa7b6674747800cc	commit \| diff
parent	45761988ac01b99f9a81ad6ec884bef3c2d8e402	commit \| diff

Merge branch 'en/doc-renormalize'

Doc updates.

* en/doc-renormalize:
doc: clarify the intent of the renormalize option in the merge machinery

Documentation/config/merge.adoc	diff1 \|	diff2 \|	blob \| history
Documentation/gitattributes.adoc	diff1 \|	diff2 \|	blob \| history
Documentation/merge-strategies.adoc	diff1 \|	diff2 \|	blob \| history

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

Documentation/config/merge.adoc	diff1 \|	diff2 \|	blob \| history
Documentation/gitattributes.adoc	diff1 \|	diff2 \|	blob \| history
Documentation/merge-strategies.adoc	diff1 \|	diff2 \|	blob \| history