diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-02-21 10:35:53 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-02-21 10:35:53 -0800 |
| commit | 55b5ba87f1ce7ef5c9f891392a7271bfc4d62d2b (patch) | |
| tree | 017d59811768d0da557ad46e196bd6448ef05add /Documentation/gitattributes.adoc | |
| parent | ee8020ff40dd3b9b472b482bfa7b6674747800cc (diff) | |
| parent | 45761988ac01b99f9a81ad6ec884bef3c2d8e402 (diff) | |
| download | git-55b5ba87f1ce7ef5c9f891392a7271bfc4d62d2b.tar.xz | |
Merge branch 'en/doc-renormalize'
Doc updates.
* en/doc-renormalize:
doc: clarify the intent of the renormalize option in the merge machinery
Diffstat (limited to 'Documentation/gitattributes.adoc')
| -rw-r--r-- | Documentation/gitattributes.adoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/gitattributes.adoc b/Documentation/gitattributes.adoc index 5d12b78549..7eaca89972 100644 --- a/Documentation/gitattributes.adoc +++ b/Documentation/gitattributes.adoc @@ -701,8 +701,8 @@ where the attribute is not in place would normally cause merge conflicts. To prevent these unnecessary merge conflicts, Git can be told to run a -virtual check-out and check-in of all three stages of a file when -resolving a three-way merge by setting the `merge.renormalize` +virtual check-out and check-in of all three stages of each file that +needs a three-way content merge, by setting the `merge.renormalize` configuration variable. This prevents changes caused by check-in conversion from causing spurious merge conflicts when a converted file is merged with an unconverted file. |