.gitconfig relevant parts @ 29.07.2016

gistfile1.txt

[alias]
    tree = log --oneline --decorate --graph
    ff = !sh -c 'branch=$(git symbolic-ref HEAD | cut -d '/' -f 3) && git rebase origin/$branch' -
    g = grep --break --heading --line-number
    show-recent = for-each-ref --sort=-committerdate refs/heads/
	ac = !sh -c 'git add -u && git commit --amend --no-edit'
    ace = !sh -c 'git add -u && git commit --amend'
    au = add -u
    auc = !sh -c 'git add -u && git commit'
	hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
    lp = log -p
    lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen (%cr) %C(bold blue)<%an>% Creset' --abbrev-commit
    lgv = log --color --graph --pretty=format:'%C(yellow)<%h> %C(bold blue)%cn%C(reset) %C(green)(%cr)%n%C(red)Author: %C(reset)%an%n%C(red)Date:   %C(reset)%ai%n%w(0,4,4)%C(red)[%C(reset) %s %C(red)]%C(reset)%n%n%w(0,4,4)%b%C(reset)%n'
    bh = for-each-ref --sort=-committerdate --format='%(committerdate:short) %(refname)' refs/heads refs/remotes --count=25
    bhf = for-each-ref --sort=-committerdate --format='%(committerdate:short) %(refname)' refs/heads refs/remotes
    pr = pull --rebase
    pf = !sh -c 'branch=$(git symbolic-ref HEAD | cut -d '/' -f 3) && git push fork' -
    pff = !sh -c 'branch=$(git symbolic-ref HEAD | cut -d '/' -f 3) && git push --force fork' -
[color]
	ui = true

[grep]
	extendRegexp = true
	lineNumber = true
[merge]
	tool = meld