sjs/config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

clean up gitconfig a bit

Browse source
This commit is contained in:
Sami Samhuri 2017-04-20 09:54:59 -07:00
parent e7f83f8aa5
commit 98e3285ac4
No known key found for this signature in database
GPG key ID: F76F41F04D99808F
1 changed files with 0 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gitconfig
View file

@ -4,8 +4,6 @@
[alias] [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' 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 g = grep --break --heading --line-number
[push]
default = upstream
[branch] [branch]
autosetupmerge = true autosetupmerge = true
[core] [core]
@ -32,20 +30,9 @@
cmd = opendiff \"$LOCAL\" \"$REMOTE\" cmd = opendiff \"$LOCAL\" \"$REMOTE\"
[credential] [credential]
helper = osxkeychain helper = osxkeychain
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
[grep] [grep]
extendRegexp = true extendRegexp = true
lineNumber = 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"] [merge "mergepbx"]
name = XCode project files merger name = XCode project files merger
driver = mergepbx %O %A %B driver = mergepbx %O %A %B