Differences

This shows you the differences between two versions of the page.

--- git_whitespace [2018/06/11 11:23] – [git diff] rpjday
+++ git_whitespace [2019/03/05 18:15] (current) – [git blame] rpjday
@@ Line 1: / Line 1: @@
 ===== Overview =====
- A moderately (dis)organized list of features related to dealing with whitespace issues in Git, in no particular order.
+ 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 ====
+<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.safecrlf ====
+==== 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.
 ===== git diff =====
@@ Line 116: / Line 138: @@
     ·   error-all is similar to error but shows all errors.
 </code>
+===== git blame =====
+<code>
+-w
+    Ignore whitespace when comparing the parent’s version and the child’s to find
+    where the lines came from.
+</code>
+===== git stripspace =====
+<code>
+$ man git-stripspace
+</code>