Differences

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

--- linux_wiki:git [2019/07/13 20:21]
billdozor [File Status]
+++ linux_wiki:git [2020/01/10 18:29] (current)
billdozor [Extra Characters in git diff]
@@ Line 144: / Line 144: @@
 \\
-Example .gitignore<code bash>*.log
+Example .gitignore<code bash># Git ignore file - comments are allowed
+__pycache__/
+*.log
 tmp/</code>
-  * Do not track any files that end in .log or are inside a tmp directory.
+  * Do not track any files that
+    * Are inside a __pycache__ directory
+    * End in .log
+    * Are inside a tmp directory
 \\
@@ Line 331: / Line 336: @@
   * Push local changes to your fork on github<code bash>git push origin master</code>
+----
+====== Troubleshooting ======
+Fixing different git issues.
+===== Extra Characters in git diff =====
+* Fix/remove 'ESC[xxx' characters in git diff<code bash>git config --global core.pager "less -R"</code>
+\\
+* Fix/remove '^M' characters in git diff<code bash>git config --global core.pager "tr -d '\r' | less -REX"</code>
 ----