[user] email = bluewind@xinu.at name = Florian Pritz signingkey = 0x4CE1C13E [alias] co = checkout s = status l = log --pretty=format:'%C(yellow)%h %Cred%ad %Cblue%an%Cgreen%d %Creset%s' --date=short --decorate=short m = commit -vs ap = add -pi cp = cherry-pick dc = diff --cached --stat -p d = diff --stat -p am = am -s c = cherry -v b = branch -vv --sort=committerdate sup = log --all --pretty=format:'%Cblue%h%C(yellow)%d %Creset%s %Cgreen(%cr) %Cred%an%+b' sp = show --stat -p mff = merge --ff-only refl = reflog --date=relative mnf = merge --no-ff ours = "!f() { git checkout --ours $@ && git add $@; }; f" theirs = "!f() { git checkout --theirs $@ && git add $@; }; f" p = push --follow-tags dw = diff --color-words ri = rebase -i --autosquash fix = commit --fixup list-branches = branch --sort=committerdate --format='%(HEAD) %(color:red)%(objectname:short)%(color:reset) %(align:30)%(color:yellow)%(refname:short)%(color:reset)%(end) %(align:30)(%(color:green)%(committerdate:relative)%(color:reset))%(end) %(align:20)%(authorname)%(end) %(contents:subject)' f = fetch -pv fa = fetch -p --all up = pull --rebase sed = ! git grep -z --full-name -l '.' | xargs -0 sed -i -e t = "!t() { git tag -a \"$1\" -m \"tagging release of $1\"; }; t" [merge] tool = kdiff3 conflictstyle = diff3 [push] default = current [color] ui = true [sendemail] smtpserver = /usr/bin/msmtp envelopesender = bluewind@xinu.at chainreplyto = false suppresscc = self #cccmd = git-cc [mergetool "cp"] cmd = cp \"$REMOTE\" \"$MERGED\" [mergetool "vim"] cmd = vim -f \"$MERGED\" [mergetool "vimdiff3"] cmd = vim -f -d -c \"wincmd J\" \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\" [mergetool "splice"] cmd = "vim -f $BASE $LOCAL $REMOTE $MERGED -c 'SpliceInit'" trustExitCode = true [core] excludesfile = ~/.gitignore compression = 9 attributesfile = ~/git/dotfiles/.gitattributes [log] decorate = full [gc] autopacklimit = 20 [tig] diff-highlight = /usr/share/git/diff-highlight/diff-highlight [pager] diff = /usr/share/git/diff-highlight/diff-highlight | less log = /usr/share/git/diff-highlight/diff-highlight | less show = /usr/share/git/diff-highlight/diff-highlight | less [grep] lineNumber = true [tag] sort = version:refname [diff] colorMoved = zebra [interactive] diffFilter = /usr/share/git/diff-highlight/diff-highlight [includeIf "gitdir:~/projects/"] path = ~/projects/.gitconfig