Skip to content

Instantly share code, notes, and snippets.

@drewdeponte
Created January 19, 2012 22:42
Show Gist options
  • Save drewdeponte/1643455 to your computer and use it in GitHub Desktop.
Save drewdeponte/1643455 to your computer and use it in GitHub Desktop.
my .gitconfig in my home directory
[user]
name = Andrew De Ponte
email = [email protected]
[color]
ui = auto
[alias]
st = status
ci = commit
co = checkout
di = diff
dc = diff --cached
amend = commit --amend
aa = add --all
head = !git l -1
h = !git head
r = !git l -20
ra = !git r --all
ff = merge --ff-only
pullff = pull --ff-only
noff = merge --no-ff
l = log --graph --abbrev-commit --date=relative
la = !git l --all
div = divergence
gn = goodness
gnc = goodness --cached
fa = fetch --all
pom = push origin master
b = branch
ds = diff --stat=160,120
dh1 = diff HEAD~1
[format]
pretty=format:%C(yellow)%h%Creset -%C(red)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset
[core]
quotepath = false
[difftool]
prompt = false
[diff]
# external = "/Applications/DeltaWalker.app/Contents/MacOS/git-diff"
tool = opendiff
[push]
default = tracking
[merge]
# tool = deltawalker
[mergetool "deltawalker"]
# cmd = "/Applications/DeltaWalker.app/Contents/MacOS/bzr-git-merge" "$LOCAL" "$REMOTE" "$BASE" "$MERGED"
[github]
user = cyphactor
token = mytokenyoudontknow
[mergetool]
keepBackup = true
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment