[alias]
+ alias = "!f() { [ $# = 2 ] && git config --global alias.\"$1\" \"$2\" && return 0 || echo \"Usage: git alias <new alias> <original command>\" >&2 && return 1; }; f"
+ aliases = !git config --get-regexp 'alias.*' | colrm 1 6 | sed 's/[ ]/ = /'
b = branch
- camend = commit --amend -C HEAD
+ branches = branch --all
+ cat = cat-file -p
+ dump = cat-file -p
+ file = cat-file -t
+ type = cat-file -t
+ camend = commit --amend --no-edit
checkin = commit
ci = commit
co = checkout
d = diff
dc = diff --cached
dshow = show --decorate
+ incoming = !git remote update --prune; git log ..@{upstream}
l = log --decorate
l1 = log --decorate --oneline
l5 = log --decorate -5
lr = log --decorate --reverse
lr1 = log --decorate --reverse --oneline
lr5 = log --decorate --reverse -5
- root = rev-parse --show-toplevel
+ null-merge = merge --strategy=ours
+ outgoing = log @{upstream}..
+ push2all = !git remote | xargs -I% -n1 git push %
+ remotes = remote -v
+ ri = "!f() { git rebase --interactive --autosquash --preserve-merges ${1:-\"@{upstream\\}\"}; }; f"
#root = !pwd
+ root = rev-parse --show-toplevel
st = status --short
stb = status --short --branch
+ tags = tag --list
unstage = reset HEAD --
wdiff = diff --word-diff
wshow = show --word-diff --decorate
# 3 way diffs
# cmd = vim -d \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\" -c \"wincmd J\"
+[push]
+ default = simple
+
[receive]
denyNonFastForwards = true