Permalink
Browse files

Enable merge log and autosetuprebase for git

  • Loading branch information...
caio committed Jan 19, 2011
1 parent ca5c9f3 commit 1587b3e8b6d297394be7707ad4c3a5d631b10b22
Showing with 3 additions and 0 deletions.
  1. +3 −0 gitconfig
View
@@ -46,6 +46,7 @@
[merge]
tool = gvimdiff
+ log = true
[help]
autocorrect = 5
@@ -70,3 +71,5 @@
[push]
default = tracking
+[branch]
+ autosetuprebase = always

0 comments on commit 1587b3e

Please sign in to comment.