Skip to content

Instantly share code, notes, and snippets.

@englishm
Last active December 27, 2015 04:58
Show Gist options
  • Save englishm/7270317 to your computer and use it in GitHub Desktop.
Save englishm/7270317 to your computer and use it in GitHub Desktop.
Add 'ignorewhitesnake' to ~/.gitconfig.
diff --git a/home/.gitconfig b/home/.gitconfig
index 4420cbe..d4bc6e4 100644
--- a/home/.gitconfig
+++ b/home/.gitconfig
@@ -17,6 +17,9 @@
[merge]
conflictstyle = diff3
+[rock]
+ ignorewhitesnake = true
+
[github]
user = englishm
[alias]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment