My git aliases and tweaks

.gitconfig

[alias]
	add-mod = !git add $(git status -uno -s | awk '{ print $2 }') && git status -uno -s
	amend = commit --amend
	ci = commit
	co = checkout
	di = diff
	fix = fixup
	st = status -s
	meld = difftool -t meld
	kdiff3 = difftool -t kdiff3
	dlog = log --color --pretty=format:\"%C(yellow)%h%Creset %ci  %C(white)%s%Creset\"
	last = log -1 --name-status --color --pretty=format:\"%C(yellow)%h%Creset %ci  %C(white)%s%Creset\"
	last5 = log -5 --name-status --color --pretty=format:\"%C(yellow)%h%Creset %ci  %C(white)%s%Creset\"
	last10 = log -10 --color --pretty=format:\"%C(yellow)%h%Creset %ci  %C(white)%s%Creset\"
	oneline = log --oneline
	tree = log --oneline --decorate --graph --all
	full-tree = !git log --oneline --decorate --graph --all $(git rev-list -g --all)
	cp = cherry-pick
[diff]
	tool = meld
	guitool = vimdiff
[merge]
	tool = mymeld
	guitool = vimdiff
[mergetool "mymeld"]
	cmd = meld "$LOCAL" "$MERGED" "$REMOTE"
[mergetool "vscode"]
    cmd = code --wait $MERGED
[difftool "vscode"]
    cmd = code --wait --diff $LOCAL $REMOTE
[difftool]
	prompt = false
[push]
	default = simple
[column]
	ui = auto
[color]
	status = auto
	diff = auto
	branch = auto
	interactive = auto
	ui = true
	pager = true