git config

[user]
me
me@

[alias]
    st  = status -s -b
    oneline = "!f () { git log --graph --color=always --abbrev-commit --date=relative --pretty=format:'%x00%h%x00%s%x00%cd%x00%an%x00%d' $@ | gawk -F '\\0' '{ printf \"%s\\033[31m%s\\033[0m %-80s \\033[32m%14s\\033[0m \\033[30;1m%s\\033[0m\\033[33m%s\\n\", $1, $2, gensub(/(.{79}).{2,}/, \"\\\\1…\",\"g\",$3), $4, $5, $6 }' | less -R; }; f"
    lg = log --graph --pretty=tformat:'%C(red)%h - %C(blue)%an %C(reset)%s %C(green)(%ci) %C(bold green)%d'
    logsvn = log --pretty=tformat:'%C(red)%h - %C(reset)%s %C(blue)%an %C(green)(%cr)%n%C(bold green)%b'
    gg = grep -En --break --heading
    amend = commit --amend
    aa = add -A .
[merge]
	conflictstyle = diff3
[push]
	default = current
[branch]
	autosetuprebase = always
[branch "*branch-name*"]
	rebase = true	
[difftool]
    prompt = false
[diff]
    tool = meld