[alias]
b = branch
+ branches = branch -a
+ camend = commit --amend -C HEAD
checkin = commit
ci = commit
co = checkout
- l1 = log --oneline
- l5 = log -5
- st = status
+ d = diff
+ dc = diff --cached
+ dshow = show --decorate
+ l = log --decorate
+ l1 = log --decorate --oneline
+ l5 = log --decorate -5
+ lg = log --decorate --graph
+ lg1 = log --decorate --graph --oneline
+ lg5 = log --decorate --graph -5
+ lr = log --decorate --reverse
+ lr1 = log --decorate --reverse --oneline
+ lr5 = log --decorate --reverse -5
+ null-merge = merge --strategy=ours
+ remotes = remote -v
+ ri = "!sh -c 'git rebase --interactive --autosquash --preserve-merges ${1:-\"@{u}\"}' -"
+ root = rev-parse --show-toplevel
+ #root = !pwd
+ st = status --short
+ stb = status --short --branch
+ tags = tag -l
+ unstage = reset HEAD --
+ wdiff = diff --word-diff
+ wshow = show --word-diff --decorate
-[core]
- pager = less -FRSXgimq
+[branch]
+ autosetuprebase = always
+
+[color]
+ ui = auto
+
+[include]
+ path = ~/lib/config/git/light_bg
+
+[log]
+ abbrevCommit = true
[merge]
tool = vimdiff
# 3 way diffs
# cmd = vim -d \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\" -c \"wincmd J\"
+[receive]
+ denyNonFastForwards = true
+
[web]
browser = webbrowser