This shows you the differences between two versions of the page.
Both sides previous revision Previous revision Next revision | Previous revision | ||
git_whitespace [2018/06/26 11:39] rpjday [config options] |
git_whitespace [2019/03/05 18:15] (current) rpjday [git blame] |
||
---|---|---|---|
Line 6: | Line 6: | ||
==== apply.ignoreWhitespace ==== | ==== apply.ignoreWhitespace ==== | ||
- | ==== apply.whitespace | + | ==== apply.whitespace ==== |
==== core.whitespace ==== | ==== core.whitespace ==== | ||
+ | |||
+ | <code> | ||
+ | $ git config --global core.whitespace \ | ||
+ | trailing-space,-space-before-tab,indent-with-non-tab,tab-in-indent,cr-at-eol | ||
+ | </code> | ||
==== core.eol ==== | ==== core.eol ==== | ||
==== core.safecrlf ==== | ==== core.safecrlf ==== | ||
==== core.autocrlf ==== | ==== core.autocrlf ==== | ||
+ | |||
+ | Setting this variable to "true" is the same as setting the text attribute to "auto" on all files and core.eol to "crlf". Set to true if you want to have CRLF line endings in your working directory and the repository has LF line endings. This variable can be set to input, in which case no output conversion is performed. | ||
+ | |||
+ | ===== git apply ===== | ||
+ | |||
+ | TO DO. | ||
Line 135: | Line 146: | ||
where the lines came from. | where the lines came from. | ||
</code> | </code> | ||
+ | |||
+ | ===== git stripspace ===== | ||
+ | |||
+ | <code> | ||
+ | $ man git-stripspace | ||
+ | </code> | ||
+ |