Files
dotfiles/git/gitconfig
Joe Fleming 8293e68365 update gitconfig
merge no-ff, new branches auto rebase
2014-05-15 12:25:30 -07:00

40 lines
819 B
Plaintext

[diff]
[color]
ui = auto
[alias]
st = status
ci = commit
co = checkout
di = diff
dc = diff --cached
amend = commit --amend
aa = add --all
ff = merge --ff-only
pullff = pull --ff-only
noff = merge --no-ff
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
head = !git l -1
h = !git head
hp = "!source ~/.githelpers && show_git_head"
r = !git l -30
ra = !git r --all
l = "!source ~/.githelpers && pretty_git_log"
la = !git l --all
todo = grep --heading --break --ignore-case -e ' FIX: *' -e ' TODO: *'
[merge]
tool = vimdiff
ff = false
[push]
default = current
[branch]
autosetuprebase = always