.gitconfig

.gitconfig

[user]
	email = kevin@deenanauth.com
	name = Kevin Deenanauth
  
[alias]
	prune = fetch --prune
	# Because I constantly forget how to do this
	# https://git-scm.com/docs/git-fetch#git-fetch--p

	undo = reset --soft HEAD^
	# Not quite as common as an amend, but still common
	# https://git-scm.com/docs/git-reset#git-reset-emgitresetemltmodegtltcommitgt

	stash-all = stash save --include-untracked
  	# We wanna grab those pesky un-added files!
  	# https://git-scm.com/docs/git-stash

	lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative

[credential]
	helper = wincred

[merge]
	ff = only
	# I pretty much never mean to do a real merge, since I use a rebase workflow.
	# Note: this global option applies to all merges, including those done during a git pull
	# https://git-scm.com/docs/git-config#git-config-mergeff

	conflictstyle = diff3
	# Standard diff is two sets of final changes. This introduces the original text before each side's changes.
	# https://git-scm.com/docs/git-config#git-config-mergeconflictStyle

[status]
	showUntrackedFiles = all
	# Sometimes a newly-added folder, since it's only one line in git status, can slip under the radar.
	# https://git-scm.com/docs/git-config#git-config-statusshowUntrackedFiles