Browse files

Added new url keyword and specified vimdiff as the mergetool.

  • Loading branch information...
1 parent 7b4de1a commit 745e2e78b0303647cf392d68f9e51870dc748234 @caio committed Apr 8, 2009
Showing with 6 additions and 0 deletions.
  1. +6 −0 .gitconfig
View
6 .gitconfig
@@ -36,3 +36,9 @@
[url "git@github.com:caio/"]
insteadOf = github:
+
+[url "git://github.com/"]
+ insteadOf = gh:
+
+[merge]
+ tool = vimdiff

0 comments on commit 745e2e7

Please sign in to comment.