Snippets

Peter Sudmant git tricks

Updated by Peter Sudmant
View revision

File snippet.txt Modified

  • Ignore whitespace
  • Hide word diff 
 diffg RE / diffg LO
 ------------
 
-
+------------
+cleaning up a giant git repo
+https://stackoverflow.com/questions/1029969/why-is-my-git-repository-so-big
+------------
Created by Peter Sudmant
View revision

File snippet.txt Added

  • Ignore whitespace
  • Hide word diff 
+------------
+when merging w/ lots of conflicts - taking just the SOURCE or the TARGET
+https://stackoverflow.com/questions/10697463/resolve-git-merge-conflicts-in-favor-of-their-changes-during-a-pull
+------------
+
+------------
+using the difftool
+
+https://gist.github.com/mattratleph/4026987
+
+##start merge
+git mergetool
+
+##vimdiff commands
+
+]c :        - next difference
+[c :        - previous difference
+do          - diff obtain
+dp          - diff put
+zo          - open folded text
+zc          - close folded text
+:diffupdate - re-scan the files for differences
+
+https://stackoverflow.com/questions/161813/how-to-resolve-merge-conflicts-in-git
+diffg RE / diffg LO
+------------
+
+
HTTPS SSH

You can clone a snippet to your computer for local editing. Learn more.