Differences
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/11 12:29] – [Overview] rpjday | git_whitespace [2019/03/05 18:15] (current) – [git blame] rpjday | ||
|---|---|---|---|
| Line 2: | Line 2: | ||
| A moderately (dis)organized list of features related to dealing with whitespace issues in Git, in no particular order. It's a matter of some debate whether EOL standardization is simply a subet of whitespace issues, or whether it deserves its own page. | A moderately (dis)organized list of features related to dealing with whitespace issues in Git, in no particular order. It's a matter of some debate whether EOL standardization is simply a subet of whitespace issues, or whether it deserves its own page. | ||
| + | |||
| + | ===== config options ===== | ||
| + | |||
| + | ==== apply.ignoreWhitespace ==== | ||
| + | ==== apply.whitespace ==== | ||
| + | ==== core.whitespace ==== | ||
| + | |||
| + | < | ||
| + | $ git config --global core.whitespace \ | ||
| + | trailing-space, | ||
| + | </ | ||
| + | ==== core.eol ==== | ||
| + | ==== core.safecrlf ==== | ||
| + | ==== core.autocrlf ==== | ||
| + | |||
| + | Setting this variable to " | ||
| + | |||
| + | ===== git apply ===== | ||
| + | |||
| + | TO DO. | ||
| + | |||
| + | |||
| ===== git diff ===== | ===== git diff ===== | ||
| Line 116: | Line 138: | ||
| · | · | ||
| </ | </ | ||
| + | |||
| + | ===== git blame ===== | ||
| + | |||
| + | < | ||
| + | -w | ||
| + | Ignore whitespace when comparing the parent’s version and the child’s to find | ||
| + | where the lines came from. | ||
| + | </ | ||
| + | |||
| + | ===== git stripspace ===== | ||
| + | |||
| + | < | ||
| + | $ man git-stripspace | ||
| + | </ | ||
| + | |||