diff --git a/tilde/gitconfig b/tilde/gitconfig index 7040cde..45d2ae3 100644 --- a/tilde/gitconfig +++ b/tilde/gitconfig @@ -1,5 +1,6 @@ [color] ui = auto + [color "diff"] meta = blue frag = white @@ -30,7 +31,7 @@ conflicts = diff --name-only --diff-filter=U commerge = commit --no-edit [push] - default = current + default = simple # Any GitHub repo with my username should be checked out r/w by default # http://rentzsch.tumblr.com/post/564806957/public-but-hackable-git-submodules