.gitconfig

[color]
	ui = auto
[user]
	name = Neil Traft
	email = ntraft@gmail.com
[init]
	defaultBranch = main
[merge]
	defaultToUpstream = true
	conflictstyle = diff3
	tool = meld
[pager]
	# Force diffs to always be opened in a pager, not printed to command line.
	diff = less -+F -+X
	# Same for some other commands.
	log = less -+F -+X
	show = less -+F -+X
[alias]
	st = status -sb
	ci = commit
	cir = commit -c HEAD --reset-author
	co = checkout
    up = checkout @{u}
	di = diff
	dic = diff --cached
	din = diff --name-status
    diu = diff @{u}
    dinu = diff --name-status @{u}
    compare = diff --no-index
    cmp = diff --no-index
	br = branch
	bv = branch -vv
	currbranch = rev-parse --abbrev-ref HEAD
	newbranch = checkout -t -b
	nb = checkout -t -b
	publish = push -u origin
	pushup = push origin
	aa = add --all
	au = add -u
	sh = show --name-status
	# Graphical git log
	lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%C(bold blue)<%an>%Creset' --abbrev-commit
	lga = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%C(bold blue)<%an>%Creset' --abbrev-commit --all
	# Detailed view of branches by age
	bl=for-each-ref --sort=-committerdate --format='%(color:red)%(objectname:short) %(color:green)%(committerdate:relative) %(color:reset)%(refname:short) %(color:blue)%(authorname)' refs/heads/
[filter "lfs"]
	process = git-lfs filter-process
	required = true
	clean = git-lfs clean -- %f
	smudge = git-lfs smudge -- %f