dump = cat-file -p
file = cat-file -t
type = cat-file -t
- camend = commit --amend --reuse-message=HEAD
+ 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
lr1 = log --decorate --reverse --oneline
lr5 = log --decorate --reverse -5
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:-\"@{u\\}\"}; }; f"
+ ri = "!f() { git rebase --interactive --autosquash --preserve-merges ${1:-\"@{upstream\\}\"}; }; f"
#root = !pwd
root = rev-parse --show-toplevel
st = status --short
# 3 way diffs
# cmd = vim -d \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\" -c \"wincmd J\"
+[push]
+ default = simple
+
[receive]
denyNonFastForwards = true