git_aliases

.gitconfig

[user]
	name = Philipp Andreychev
[core]
	editor = vim
[alias]
	unstage = reset HEAD --
	co = checkout
	br = branch
	ci = commit
	stat = status
	last = log -1 HEAD
	b = branch
	cia = commit -a
	cim = commit -m
	d = diff --color-words
	f = "!git ls-files | grep -i"
	s = status -sb

	r = reset
	r1 = reset HEAD^
	r2 = reset HEAD^^

	l = log --graph --pretty=format:'%C(magenta)%h%C(blue)%d%Creset %s %C(blue bold)- %an, %ar%Creset'
	ll = log --stat --abbrev-commit
	ls = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate
	lnc = log --pretty=format:"%h\\ %s\\ [%cn]"

	dlc = diff --cached HEAD^
	conflicts = diff --name-only --diff-filter=U

	la = "!git config -l | grep alias | cut -c 7-"

	sl = stash list
	sa = stash apply
	ss = stash save
[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
[color]
	ui = 1