gitconfig

[includeIf "gitdir:~/dev/mojotech/"]
  path = "~/dev/mojotech/.gitconfig"

[alias]
  uncommit = reset --soft HEAD^
  lg = log --graph --pretty=oneline --abbrev-commit
  ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
  ls = log --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=short
  fl = log -u
  dl = "!git ll -1"
  dlc = diff --cached HEAD^
  b = branch
  unstage = reset HEAD
  current-branch = !git symbolic-ref -q HEAD | sed -e 's|^refs/heads/||'
  # Usage: git track origin/feature-123-login-form
  track = checkout -t
  standup = !"git log --reverse --branches --since=$(if [[ "Mon" == "$(date +%a)" ]]; then echo "last friday"; else echo "yesterday"; fi) --author=$(git config --get user.email) --format=format:'%C(cyan) %ad %C(yellow)%h %Creset %s %Cgreen%d' --date=local"
	recent = branch --sort=-committerdate --format=\"%(committerdate:relative)%09%(refname:short)\"
[apply]
  whitespace = nowarn
[color]
  ui = auto
[color "status"]
  added = yellow
  changed = red
  untracked = cyan
[column]
  ui = auto,dense
[core]
  pager = less -r
  mergeoptions = --no-ff --no-commit
	excludesfile = /Users/joealba/.gitignore
[diff]
  submodule = log
  compactionHeuristic = true
[difftool "sourcetree"]
	cmd = opendiff \"$LOCAL\" \"$REMOTE\"
	path = 
[filter "lfs"]
	clean = git-lfs clean -- %f
	smudge = git-lfs smudge -- %f
  required = true
	process = git-lfs filter-process
[github]
  user = joealba
[gpg]
  program = gpg2
[interactive]
  diffFilter = diffr
[merge]
  stat = true
  conflictstyle = diff3
[mergetool "sourcetree"]
	cmd = /Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
	trustExitCode = true
[pager]
  log = diffr | less
  show = diffr | less
  diff = diffr | less
[pull]
  default = current
  ff = only
[push]
  default = upstream
[rerere]
  enabled = 0
[user]
	name = Joe Alba
	email = joe@joealba.com
[init]
  defaultBranch = main
[commit]
	template = /Users/joealba/.stCommitMsg
[rebase]
	updateRefs = true