Permalink
Find file
Fetching contributors…
Cannot retrieve contributors at this time
executable file 70 lines (69 sloc) 2.05 KB
[core]
attributesfile = ~/.gitattributes
excludesfile = ~/.gitignore
[user]
name = Colin Hebert
email = hebert.colin@gmail.com
signingkey = 5C30725AB251152A
[color]
ui = true
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "diff"]
meta = yellow bold
frag = magenta bold
old = red bold
new = green bold
[color "status"]
added = yellow
changed = green
untracked = cyan
[alias]
stat = status
st = status --short
remove = rm
ci = commit -v
cia = commit --amend -v
ciaa = commit -a --amend -v
br = branch
co = checkout
df = diff
lg = log -p
loll = log --graph --decorate --pretty=oneline --abbrev-commit
lol = !git --no-pager loll
lolal = log --graph --decorate --pretty=oneline --abbrev-commit --all
lola = !git --no-pager lolal
ls = ls-files
unstash = stash pop
log-merge = !git log $(git merge-base --octopus $(git log -1 --merges --pretty=format:%P $1))..$1 --graph --pretty=oneline --abbrev-commit --boundary
log-all = !git log --graph --decorate --pretty=oneline --abbrev-commit --all $(git fsck --no-reflogs | grep commit | cut -d\\ -f3)
git = !git
stree = !stree
man = help
fap = fetch --all -p
assumed = "!git ls-files -v | grep ^h | cut -c 3-"
assume = update-index --assume-unchanged
unassume = update-index --no-assume-unchanged
unassumeall = "!git assumed | xargs git update-index --no-assume-unchanged"
restash = !git update-ref -m $(git log -1 --pretty=format:'%s' $1) refs/stash $1
[rerere]
enabled = false
[diff]
tool = Kaleidoscope
[diff "plist"]
textconv = catplist
[merge]
tool = Kaleidoscope
[difftool]
prompt = false
[mergetool]
prompt = false
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustExitCode = true
[credential]
helper = osxkeychain