dot_gitconfig

[filter "lfs"]
	clean = git-lfs clean -- %f
	smudge = git-lfs smudge -- %f
	process = git-lfs filter-process
	required = true
[user]
	name = mcgonagle
	email = mcgonagle@github.com
	signingkey = FBD596208D29D13D
[alias]
	vlog = " log --graph --date-order --date=relative --pretty=format:\"%C(cyan)%h: %Cblue - %an - %Cgreen %C(cyan)%ar:%Creset%n%s%n\" --color"
	co = checkout
	st = status

	# mostly from https://github.com/citizen428/dotfiles/blob/master/git/.gitconfig
	#  
  	# I like using the interactive mode to make complex commits
  	a = add --all
 	ai = add --interactive

  	# All the aliases relate to commits. Note that
  	# they are grouped by common prefixes, so I don't
  	# confuse what I want done by accident.
  	c = commit
  	# commit with a message
  	cm = commit -m
  	cma = commit -a -m
  	# amending the previous commit
  	ca = commit --amend
  	caa = commit -a --amend -C HEAD

  	deleted = log --diff-filter=D --summary

  	# reset
  	## soft resets
  	r = reset
  	r1 = reset HEAD^
  	r2 = reset HEAD^^
  	## hard resets
  	rh = reset --hard
  	rh1 = reset HEAD^ --hard
  	rh1 = reset HEAD^^ --hard

  	# shortcuts for commands
  	b = branch
  	co = checkout
  	d = diff
  	f = fetch
  	l = log
  	l1 = log --oneline
  	lg = log --graph --oneline --decorate --date=relative --all
  	m = merge
  	mt = mergetool
  	p = pull
  	rp = git remote prune origin
  	s = status -sb
  	st = status
  	sw = switch
	conflicts = diff --name-only --diff-filter=U

[color]
	ui = auto
[core]
	editor = nvim
	excludesfile = /Users/tom/.gitignore_global
	pager = less -x4
[alais]
	br = branch
[push]
	default = simple
[pull]
	rebase = true
	ff = only
[fetch]
	prune = true
[merge]
	ff = false
	tool = vscode
[grep]
	lineNumber = true
[diff]
	wsErrorHighlight = all
	tool = vscode
[difftool "vscode"]
	cmd = code --wait --diff $LOCAL $REMOTE
[mergetool "vscode"]
	cmd = code --wait --merge $REMOTE $LOCAL $BASE $MERGED