2012-06-18 01:10:31 +02:00
|
|
|
########################################################################
|
|
|
|
|
# Le Git Config
|
|
|
|
|
########################################################################
|
|
|
|
|
|
|
|
|
|
[user]
|
2012-11-27 16:38:15 +01:00
|
|
|
email = matthias.kretschmann@ezeep.com
|
2012-06-18 01:10:31 +02:00
|
|
|
name = Matthias Kretschmann
|
|
|
|
|
[github]
|
|
|
|
|
user = kremalicious
|
|
|
|
|
[credential]
|
|
|
|
|
helper = osxkeychain
|
|
|
|
|
[core]
|
|
|
|
|
excludesfile = ~/.gitignore_global
|
|
|
|
|
quotepath = false
|
|
|
|
|
[color]
|
|
|
|
|
diff = auto
|
|
|
|
|
status = auto
|
|
|
|
|
branch = auto
|
|
|
|
|
interactive = auto
|
|
|
|
|
ui = auto
|
|
|
|
|
[color "branch"]
|
|
|
|
|
current = green bold
|
|
|
|
|
local = green
|
|
|
|
|
remote = red bold
|
|
|
|
|
[color "diff"]
|
|
|
|
|
meta = yellow bold
|
|
|
|
|
frag = magenta bold
|
|
|
|
|
old = red bold
|
|
|
|
|
new = green bold
|
|
|
|
|
[color "status"]
|
|
|
|
|
added = green bold
|
|
|
|
|
changed = yellow bold
|
|
|
|
|
untracked = red
|
|
|
|
|
[push]
|
|
|
|
|
#'git push' only the current branch
|
|
|
|
|
default = current
|
|
|
|
|
[alias]
|
|
|
|
|
s = status
|
|
|
|
|
a = !git add . && git status
|
|
|
|
|
c = commit
|
|
|
|
|
cm = commit -m
|
|
|
|
|
l = log --graph --pretty=format:'%C(yellow)%h%C(cyan)%d%Creset %s %C(white)- %an, %ar%Creset'
|
2013-06-20 18:26:10 +02:00
|
|
|
ll = log --stat --abbrev-commit
|
|
|
|
|
[difftool "sourcetree"]
|
|
|
|
|
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
|
|
|
|
|
path =
|
|
|
|
|
[mergetool "sourcetree"]
|
|
|
|
|
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
|
|
|
|
|
trustExitCode = true
|
|
|
|
|
[diff]
|
|
|
|
|
tool = diffmerge
|
|
|
|
|
[difftool "diffmerge"]
|
|
|
|
|
cmd = diffmerge \"$LOCAL\" \"$REMOTE\"
|
|
|
|
|
[merge]
|
|
|
|
|
tool = diffmerge
|
|
|
|
|
[mergetool "diffmerge"]
|
|
|
|
|
cmd = "diffmerge --merge --result=\"$MERGED\" \"$LOCAL\" \"$(if test -f \"$BASE\"; then echo \"$BASE\"; else echo \"$LOCAL\"; fi)\" \"$REMOTE\""
|
|
|
|
|
trustExitCode = true
|
