1
0
mirror of https://github.com/kremalicious/dotfiles.git synced 2024-12-23 09:42:45 +01:00
dotfiles/gitconfig

56 lines
1.3 KiB
Plaintext
Raw Normal View History

2012-06-18 01:10:31 +02:00
########################################################################
# Le Git Config
########################################################################
[user]
email = m@kretschmann.io
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]
default = matching
2012-06-18 01:10:31 +02:00
[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
2013-06-25 13:28:47 +02:00
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
2013-06-20 18:26:10 +02:00
[diff]
2013-06-25 13:28:47 +02:00
tool = Kaleidoscope
[difftool]
prompt = false
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustExitCode = true
[mergetool]
prompt = false
2013-06-20 18:26:10 +02:00
[merge]
2013-06-25 13:28:47 +02:00
tool = Kaleidoscope