diff options
author | Junio C Hamano <junio@hera.kernel.org> | 2008-02-17 03:53:51 +0000 |
---|---|---|
committer | Junio C Hamano <junio@hera.kernel.org> | 2008-02-17 03:53:51 +0000 |
commit | 26e590af87e1a4283ac0668cc1386493576f703b (patch) | |
tree | 115c1ae9bf587e5d00ec7456acd7997e3b0f3864 /gitattributes.txt | |
parent | 21391935ea09bef7fec78d01ee8f9e7d103fa710 (diff) | |
download | git-htmldocs-26e590af87e1a4283ac0668cc1386493576f703b.tar.gz |
Autogenerated HTML docs for v1.5.4.1-183-gf873
Diffstat (limited to 'gitattributes.txt')
-rw-r--r-- | gitattributes.txt | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/gitattributes.txt b/gitattributes.txt index 35a29fd60..84ec9623a 100644 --- a/gitattributes.txt +++ b/gitattributes.txt @@ -133,6 +133,26 @@ When `core.autocrlf` is set to "input", line endings are converted to LF upon checkin, but there is no conversion done upon checkout. +If `core.safecrlf` is set to "true" or "warn", git verifies if +the conversion is reversible for the current setting of +`core.autocrlf`. For "true", git rejects irreversible +conversions; for "warn", git only prints a warning but accepts +an irreversible conversion. The safety triggers to prevent such +a conversion done to the files in the work tree, but there are a +few exceptions. Even though... + +- "git add" itself does not touch the files in the work tree, the + next checkout would, so the safety triggers; + +- "git apply" to update a text file with a patch does touch the files + in the work tree, but the operation is about text files and CRLF + conversion is about fixing the line ending inconsistencies, so the + safety does not trigger; + +- "git diff" itself does not touch the files in the work tree, it is + often run to inspect the changes you intend to next "git add". To + catch potential problems early, safety triggers. + `ident` ^^^^^^^ |