gitconfig

[include]

  # For username / credentials / etc
  path = ~/.gitconfig.local


[alias]

  # 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 --color | diff-so-fancy"

  # `git di $number` shows the diff between the state `$number` revisions ago and the current state
  di = !"d() { git diff --patch-with-stat HEAD~$1; }; git diff-index --quiet HEAD -- || clear; d"

  # Pull in remote changes for the current repository and all its submodules
  p = !"git pull; git submodule foreach git pull origin master"

  # Clone a repository including all submodules
  c = clone --recursive

  # Switch to a branch, creating it if necessary
  go = "!f() { git checkout \"$1\" 2> /dev/null || git checkout -b \"$1\"; }; f"

  # Delete remotely deleted branches
  gone = "!f() { git fetch --all --prune; git branch -vv | awk '/: gone]/{print $1}' | xargs git branch -D; }; f"

  # Show verbose output about tags, branches or remotes
  tags = tag -l
  branches = branch -a
  remotes = remote -v

  # Credit an author on the latest commit
  credit = "!f() { git commit --amend --author \"$1 <$2>\" -C HEAD; }; f"

  # Interactive rebase with the given number of latest commits
  reb = "!r() { git rebase -i HEAD~$1; }; r"

  # Remove the old tag with this name and tag the latest commit with it.
  retag = "!r() { git tag -d $1 && git push origin :refs/tags/$1 && git tag $1; }; r"

  # Find branches containing commit
  fb = "!f() { git branch -a --contains $1; }; f"

  # Find tags containing commit
  ft = "!f() { git describe --always --contains $1; }; f"

  # Find commits by source code
  fc = "!f() { git log --pretty=format:'%C(yellow)%h  %Cblue%ad  %Creset%s%Cgreen  [%cn] %Cred%d' --decorate --date=short -S$1; }; f"

  # Find commits by commit message
  fm = "!f() { git log --pretty=format:'%C(yellow)%h  %Cblue%ad  %Creset%s%Cgreen  [%cn] %Cred%d' --decorate --date=short --grep=$1; }; f"

  # Remove branches that have already been merged with master
  # a.k.a. 'delete merged'
  dm = "!git branch --no-column --merged origin/master | grep -v '\\*' | xargs -n 1 git branch -d"
  dmain = "!git branch --no-column --merged origin/main | grep -v '\\*' | xargs -n 1 git branch -d"

  # Remove branches if their tracking branches where deleted on the remote
  # a.k.a. 'delete gone'
  dg = "!git fetch -p && for branch in `git branch -vv | grep ': gone]' | awk '{print $1}'`; do git branch -D $branch; done"

  # List contributors with number of commits
  contributors = shortlog --summary --numbered

  # Merge GitHub pull request on top of the `master` branch
  mpr = "!f() { \
    if [ $(printf \"%s\" \"$1\" | grep '^[0-9]\\+$' > /dev/null; printf $?) -eq 0 ]; then \
      git fetch origin refs/pull/$1/head:pr/$1 && \
      git rebase master pr/$1 && \
      git checkout master && \
      git merge pr/$1 && \
      git branch -D pr/$1 && \
      git commit --amend -m \"$(git log -1 --pretty=%B)\n\nCloses #$1.\"; \
    fi \
  }; f"

  # Tag the latest commit and push it to origin
  tagg = "!f() { git tag $1 && git push origin $1; }; f"

  # Remove a tag and delete it from origin
  tagd = "!f() { git tag -d $1 && git push origin :refs/tags/$1; }; f"

  # Undo last commit
  undo-commit = reset --soft HEAD^

  # Short forms
  a           = add
  aa          = add --all

  b           = !git branch -vv
  br          = !git branch -vv
  bd          = branch --delete
  ba          = !git branch -avv
  ca          = commit --amend --no-edit
  ci          = commit --verbose
  cm          = commit -m
  cmf         = commit --no-verify -m
  co          = checkout
  cp          = cherry-pick
  fa          = fetch --all
  mi          = merge --no-ff --no-edit
  merged      = branch --merged
  pick        = cherry-pick
  pu          = push -u
  puf         = push -u --force
  pp          = pull --prune --rebase --autostash
  rb          = rebase --autostash
  rba          = rebase --abort
  rbc          = rebase --continue
  rbi         = !git rb --interactive
  rh          = reset --hard
  s           = status --short --branch
  st          = status --short --branch -- .
  ss          = stash save -u
  sp          = stash pop
  unstage     = reset HEAD

  # history / log
  hlog    = !git log --color=always --date=relative --pretty=hist

  hist    = !git hlog --graph --date-order
  h       = !git --no-pager hist -10
  hh      = !git --no-pager hist -50
  hhh     = !git --no-pager hist
  hc      = !git h --no-merges
  hhc     = !git hh --no-merges
  hhhc    = !git hhh --no-merges

  histstat= "!git hc --stat=160,160 \"$@\" | perl -ne '/([|*])/; if($1 eq \"*\") { print } else { m/[|] *[0-9]/ and print }'; true"
  hstat   = !git --no-pager histstat -10
  hhstat  = !git --no-pager histstat -20
  hhhstat = !git --no-pager histstat

  hstats  = !git hc --shortstat --dirstat=changes,10
  hhstats = !git hhc --shortstat --dirstat=changes,10
  hhhstats= !git hhhc --shortstat --dirstat=changes,10


[apply]

  # Detect whitespace errors when applying a patch
  whitespace = fix


[core]

  # Use custom `.gitignore` and `.gitattributes`
  excludesfile = ~/.gitignore
  attributesfile = ~/.gitattributes

  # Treat spaces before tabs and all kinds of trailing whitespace as an error
  # [default] trailing-space: looks for spaces at the end of a line
  # [default] space-before-tab: looks for spaces before tabs at the beginning of a line
  whitespace = space-before-tab,-indent-with-non-tab,trailing-space

  # Make `git rebase` safer on OS X
  # More info: <http://www.git-tower.com/blog/make-git-rebase-safe-on-osx/>
  trustctime = false

  # Prevent showing files whose names contain non-ASCII symbols as unversioned.
  # http://michael-kuehnel.de/git/2014/11/21/git-mac-osx-and-german-umlaute.html
  precomposeunicode = false

  editor = vim
  pager = diff-so-fancy | less --tabs=4 -RFX


[color]

  # Use colors in Git commands that are capable of colored output when
  # outputting to the terminal. (This is the default setting in Git ≥ 1.8.4.)
  ui = auto


[color "branch"]

  current = yellow reverse
  local = yellow
  remote = green


[color "diff"]

  meta = yellow bold
  frag = magenta bold # line info
  old = red # deletions
  new = green # additions


[color "status"]

  added = yellow
  changed = green
  untracked = cyan


[column]

  # This lets "git stat" stack multiple filenames per row (like vanilla 'ls')
  ui = always


[diff]

  # Detect copies as well as renames
  renames = copies

  # Do not show any source or destination prefix
  noprefix = true


[format]

  # More detail for "git show"
  pretty = fuller


[help]

  # Automatically correct and execute mistyped commands
  autocorrect = 1


[merge]

  # This is REALLY useful.  Adds 'original_version' to diffs like so:
  # <<<<<<<
  # OUR_VERSION
  # |||||||
  # ORIGNINAL_VERSION
  # =======
  # THEIR_VERSION
  # >>>>>>>
  conflictstyle = diff3
  defaultToUpstream = true


[pretty]

  hist      = "%C(bold yellow)%h %C(bold green)(%ad) %C(reset)%C(red)[%an] %C(reset)%s%C(bold red)%d%C(reset)"


[push]

  # Git 2 default push strategy
  default = current
  # Make `git push` push relevant annotated tags when pushing branches out.
  followTags = true


# URL shorthands

[url "git@github.com:"]

  insteadOf = "gh:"
  pushInsteadOf = "github:"
  pushInsteadOf = "git://github.com/"

[url "git://github.com/"]

  insteadOf = "github:"

[url "git@gist.github.com:"]

  insteadOf = "gst:"
  pushInsteadOf = "gist:"
  pushInsteadOf = "git://gist.github.com/"

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

  insteadOf = "gist:"


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

[pull]
  rebase = true

[credential]
  helper = osxkeychain

[color "diff-highlight"]
  oldHighlight = red bold 52
  newNormal = green bold
  newHighlight = green bold 22
  oldNormal = red bold

[include]
  path = ~/.gitconfig.personal

[includeIf "gitdir:~/Projects/MW/"]
  path = ~/.gitconfig.work

[init]
  defaultBranch = master

[commit]
  gpgsign = true

[gpg]
  program = gpg