.gitconfig

[user]
	name = Viktor
	email = [email protected]
[alias]
	st = diff --stat
	oldlog  = log \
		--abbrev-commit \
		--abbrev=4 \
		--pretty=oneline \
		--graph \
		--color=auto
	l  = log \
		--abbrev-commit \
		--abbrev=4 \
		--pretty=oneline \
		--graph \
		--color=auto \
		--decorate=short
	sl = log \
		--abbrev-commit \
		--abbrev=4 \
		--pretty=oneline \
		--graph \
		--color=auto \
		--decorate=short \
		origin/master..HEAD
	la = log \
		--abbrev-commit \
		--abbrev=6 \
		--format='%h %Cblue%aN%Cgreen%d%Creset %s' \
		--graph \
		--decorate=short
	s  = status \
		--short \
		--branch \
		--untracked-files=normal
	b  = branch
	bb = branch -a
	c  = checkout
	d  = diff \
		 --minimal \
		 --word-diff=color
	dt = difftool \
		--no-prompt
	m  = merge \
		--ff-only
	mt = mergetool \
		--no-prompt
	ci = commit
	cim = commit -m
	cam = commit -a -m
	ca = commit -a
	ai = add -i
	aa = add -A
	cp = cherry-pick
	p = push
	pu = push -u
	showtool = "!sh -c 'if [ -z $1 ]; then REVISION=HEAD; else REVISION=$1; fi; git difftool $REVISION~ $REVISION' -"
[color]
	ui = true
[push]
	default = current
[difftool "Kaleidoscope"]
	cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[diff]
	tool = Kaleidoscope
[difftool]
	prompt = false
[mergetool "Kaleidoscope"]
	cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
	trustExitCode = true
[mergetool]
	prompt = false
[merge]
	tool = Kaleidoscope
[branch]
	autosetuprebase = always