Created
July 7, 2012 09:07
-
-
Save jk/3065570 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[user] | |
name = Jens Kohl | |
email = jens.kohl@… | |
signingkey = 8EFDF903 | |
[color] | |
status = auto | |
diff = auto | |
branch = auto | |
interactive = auto | |
pager = false | |
ui = true | |
[color "status"] | |
added = yellow | |
changed = green | |
untracked = cyan | |
[color "branch"] | |
current = yellow reverse | |
local = yellow | |
remote = green | |
[color "diff"] | |
meta = yellow | |
frag = magenta | |
old = red | |
new = green | |
[alias] | |
st = status | |
ci = commit -v | |
co = checkout | |
l = log | |
staged = diff --cached | |
unstaged = diff | |
both = diff HEAD | |
oneline = log --pretty=oneline | |
amend = commit --amend | |
reci = commit --amend | |
sign = tag -s | |
d = difftool | |
w = whatchanged | |
pom = push origin master | |
b = branch -a | |
cloner = clone --recursive | |
cr = clone --recursive | |
hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short | |
type = cat-file -t | |
info = cat-file -p | |
lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit | |
[apply] | |
whitespace = fix | |
[diff] | |
tool = chdiff | |
[difftool] | |
prompt = false | |
[difftool "chdiff"] | |
cmd = /usr/bin/env chdiff --wait "$LOCAL" "$REMOTE" | |
[difftool "Kaleidoscope"] | |
cmd = ksdiff-wrapper git "$LOCAL" "$REMOTE" | |
[merge] | |
tool = chdiff | |
[mergetool "chdiff"] | |
cmd = /usr/bin/env chdiff --wait "$LOCAL" "$REMOTE" | |
keepBackup = false | |
trustExitCode = false | |
[sendemail] | |
smtpserver = … | |
aliasesfile = /Users/jkohl/.gitaliases | |
aliasfiletype = mailrc | |
smtpuser = … | |
smtppass = … | |
smtpssl = true | |
[format] | |
numbered = auto | |
[core] | |
legacyheaders = false | |
excludesfile = /Users/jkohl/.gitignore_global | |
editor = mate -w | |
quotepath = false | |
# pager = mate -w | |
[repack] | |
usedeltabaseoffset = true | |
[github] | |
user = jk | |
token = … | |
[branch "master"] | |
remote = origin | |
merge = refs/heads/master | |
[difftool "sourcetree"] | |
cmd = /applications/p4merge.app/Contents/MacOS/p4merge \"$LOCAL\" \"$REMOTE\" | |
path = | |
[mergetool "sourcetree"] | |
cmd = /Applications/p4merge.app/Contents/MacOS/p4merge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\" | |
trustExitCode = true | |
[mergetool] | |
keepBackup = true | |
[help] | |
autocorrect = 1 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment