.gitconfig

# Personal user
[user]
	name = Your Name
	email = [email protected]
	# signingkey = xxxxxxxxxxx
	editor = vim
# Work user
[includeIf "gitdir:~/Work/"]
	path = .gitconfig-work
[core]
	excludesfile = ~/.gitignore-global
	commentChar = ";"
	pager = delta
[alias]
	st = status
	ci = commit
	co = checkout
	colast = checkout @{-1}  # git checkout -
	br = branch
	gr = grep -I
	glog = log --graph --all
	ll = log --oneline
	praise = blame
	ch = cherry-pick
	ls = ls-files
	tip = cat-file -p HEAD
	zip = archive -o latest.zip HEAD
	merged = branch --merged
	unstage = reset --soft HEAD^
	newtask = commit --allow-empty
	starttask = newtask
	fix = commit --fixup
[color]
	diff = auto
	status = auto
	branch = auto
[push]
	default = simple
	followTags = true
[merge]
	tool = meld
	conflictStyle = zdiff3
[grep]
	lineNumber = true
	extendedRegexp = true
	fullName = true
[branch]
	autosetupmerge = always
	sort = -committerdate
[tag]
	sort = -version:refname
[rebase]
	autosquash = true
[interactive]
	diffFilter = delta --color-only --features=interactive
[delta]
	# diff-so-fancy = true
	features = decorations  # line numbers
	navigate = true  # use n and N to move between diff sections
# Make delta decorations look like diff-so-fancy
[delta "decorations"]
	file-style = brightyellow
	file-decoration-style = brightyellow ul ol
[commit]
	# gpgsign = true
	verbose = true
[log]
	date = local
[format]
	pretty = format:%C(yellow)%h %Cblue%>(25)%ad %Cgreen%<(13)%aN%Cred%d %Creset%s
[fetch]
	all = true
[pull]
	ff = only
[diff]
	algorithm = histogram
# This will mark moved lines differently from changed ones. I find it a bit confusing.
#	colorMoved = default
[safe]
	directory = /etc
# [url "[email protected]:"]
# 	insteadOf = "https://github.com/"