From 98e3285ac4546631bcb7cb04e4eb8413b5f440d3 Mon Sep 17 00:00:00 2001 From: Sami Samhuri Date: Thu, 20 Apr 2017 09:54:59 -0700 Subject: [PATCH] clean up gitconfig a bit --- gitconfig | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/gitconfig b/gitconfig index fbf1c7f..066eb60 100644 --- a/gitconfig +++ b/gitconfig @@ -4,8 +4,6 @@ [alias] l = log --graph --abbrev-commit --date=relative --pretty=format:'%Cred%h%Creset %C(yellow)%d%Creset %s %Cgreen(%an, %C(bold green)%cr%Cgreen)%Creset' g = grep --break --heading --line-number -[push] - default = upstream [branch] autosetupmerge = true [core] @@ -32,20 +30,9 @@ cmd = opendiff \"$LOCAL\" \"$REMOTE\" [credential] helper = osxkeychain -[difftool "sourcetree"] - cmd = opendiff \"$LOCAL\" \"$REMOTE\" - path = [grep] extendRegexp = true lineNumber = true -[filter "media"] - required = true - clean = git media clean %f - smudge = git media smudge %f -[filter "hawser"] - clean = git hawser clean %f - smudge = git hawser smudge %f - required = true [merge "mergepbx"] name = XCode project files merger driver = mergepbx %O %A %B