[core]
	excludesfile = C:/Users/X/.gitignore
	autocrlf = true

[alias]
	a = add
	aa = add .
	ap = add -p

	# list aliases
	al = "!git config -l | grep alias | cut -c 7-"

	b = branch
	# list branches sorted by last modified
	bl = "!git for-each-ref --sort='-authordate' --format='%(authordate)%09%(objectname:short)%09%(refname)' refs/heads | sed -e 's-refs/heads/--'"

	c = commit --verbose
	ca = commit -a --verbose
	cm = commit -m
	cam = commit -a -m
	m = commit --amend --verbose
	ma = commit -a --amend --verbose

	co = checkout
	cob = checkout -b

	cp = cherry-pick
	cpa = cherry-pick --abort
	cpc = cherry-pick --continue

	d = diff
	ds = diff --stat
	dc = diff --cached

	fo = fetch origin
	fu = fetch upstream

	fi = flow init
	fff = flow feature finish
	ffph = flow feature publish
	ffpl = flow feature pull
	ffs = flow feature start
	fhf = flow hotfix finish
	fhs = flow hotfix start
	frf = flow release finish
	frph = flow release publish
	frs = flow release start
	frt = flow release track

	l = log --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=short

	pho = push origin
	phuo = push -u origin
	plo = pull origin
	plu = pull upstream
	plro = pull -r origin
	plru = pull -r upstream

	ri = rebase -i
	ra = rebase --abort
	rc = rebase --continue
	rs = rebase --skip

	rao = remote add origin
	rau = remote add upstream
	rro = remote remove origin
	rru = remote remove upstream

	rh = reset HEAD
	rhh = reset --hard HEAD

	s = status -s

	sa = stash apply
	sk = stash --keep-index
	sl = stash list
	sp = stash pop
	ss = stash save
	ssm = stash push -m

	hide = update-index --assume-unchanged
	show = update-index --no-assume-unchanged

[merge]
	tool = kdiff3
[mergetool "kdiff3"]
	path = C:/Program Files/KDiff3/kdiff3.exe
	trustExitCode = false
	keepBackup = false

[diff]
	guitool = kdiff3
[difftool "kdiff3"]
	path = C:/Program Files/KDiff3/kdiff3.exe
	trustExitCode = false

[gui]
	encoding = utf-8
	tabsize = 4
[push]
	followTags = true