Permalink
Switch branches/tags
Nothing to show
Find file
Fetching contributors…
Cannot retrieve contributors at this time
59 lines (56 sloc) 1.59 KB
[core]
excludesfile = /Users/craigc/.gitignore
trustctime = false
whitespace=fix,-indent-with-non-tab,trailing-space,cr-at-eol
editor = vi
quotepath = false
[github]
user = CraigCottingham
[alias]
lol = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
pr = pull-request
co = checkout
ci = commit
st = status
br = branch
df = diff
lg = log -300 --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
changes = diff --name-status -r
amend = commit --amend -C HEAD
wip = commit -am "wip"
fetch-pr = !"f() { git fetch upstream +refs/pull/$1/head:refs/remotes/origin/pr/$1; }; f"
checkout-pr = !"f() { git fetch upstream +refs/pull/$1/head:refs/remotes/origin/pr/$1; git checkout -b pr/$1 origin/pr/$1; }; f"
delete-pr = !"f() { git branch -D pr/$1; git branch -Dr origin/pr/$1; }; f"
[merge]
tool = Kaleidoscope
[mergetool]
keepBackup = true
prompt = false
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustExitCode = true
[diff]
tool = Kaleidoscope
[difftool]
prompt = false
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[apply]
whitespace = fix
[color]
branch = auto
diff = auto
status = auto
ui = true
interactive = auto
[color "status"]
added = yellow
changed = green
untracked = cyan
[push]
default = tracking
[credential]
helper = osxkeychain
[user]
email = craig@cottingham.net
name = Craig S. Cottingham