.gitconfig

[alias]
	amend = commit --amend --all
	undocommit = reset HEAD~
	hreset = reset --hard

	df = diff --color --color-words --abbrev
	lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --
	cherrypick = cherry-pick
	cherry = cherry-pick
	cp = cherry-pick

	# show commit log of unique commits of this branch (not on master)
	diffcommitsfrommaster = log --no-merges master..
	# show unified diff of unique commits of this branch
	difffrommaster = diff master...
	# ^^^^ Holy crap two dots vs three dots, so important. https://stackoverflow.com/a/48681527

	# Show the diff between the latest commit and the current state
	d = !"git diff-index --quiet HEAD -- || clear; git --no-pager diff --patch-with-stat"

[core]
	editor = code --wait
	quotepath = false
	excludesfile = ~/.gitignore
	attributesfile = ~/.gitattributes
	precomposeUnicode = true

[pager]
	# insanely beautiful diffs ==> npm install -g diff-so-fancy
	diff = diff-so-fancy | less --tabs=4 -RFX
	show = diff-so-fancy | less --tabs=4 -RFX

# so much color
[color]
	ui = auto

[color "diff"]
	meta = yellow bold
	commit = green bold
	frag = magenta bold
	old = red bold
	new = green bold
	whitespace = red reverse
        newMoved = cyan
        oldMoved = blue
[color "diff-highlight"]
	oldNormal = red bold
	oldHighlight = "red bold 52"
	newNormal = "green bold"
	newHighlight = "green bold 22"
[color "branch"]
	current = yellow reverse
	local = yellow
	remote = green
[color "status"]
	added = yellow
	changed = green
	untracked = cyan

[credential]
	helper = osxkeychain

[diff]
  compactionHeuristic = true
  tool = diffmerge
  # Show blocks of moved text of at least 20 alphanumeric characters differently than adds/deletes
  # https://blog.github.com/2018-04-05-git-217-released/
  colorMoved = zebra

[difftool "diffmerge"]
  cmd = diffmerge \"$LOCAL\" \"$REMOTE\"

[filter "media"]
  clean = git-media-clean %f
  smudge = git-media-smudge %f

[filter "lfs"]
	clean = git-lfs clean -- %f
	smudge = git-lfs smudge -- %f
	required = true
	process = git-lfs filter-process

[fetch]
	prune = true

# git mergetool
[merge]
	tool = opendiff
	renameLimit = 0

	
[url "git://gist.github.com/"]
	insteadOf = "gist:"

# correct typos
[help]
	autocorrect = 1

# use separate file for username / github token / etc
[include]
  path = ~/.gitconfig.local

[stash]
	showPatch = true

# [url "https://"]
# insteadOf = git://

[user]
	email = 52176351+humancompanion-usds@users.noreply.github.com
	name = Matthew Dingee

[stash]
  showPatch = true

[log]
  date = relative

[push]
	autoSetupRemote = true