gitconfig

# ~/.gitconfig

################################################################################

[user]
  name = Jon Atack
  email = jon@atack.com

[commit]
  gpgsign = true

[credential]
  helper = /usr/share/doc/git/contrib/credential/libsecret/git-credential-libsecret

[gpg]
  program = /home/jon/projects/python/opentimestamps-client/ots-git-gpg-wrapper.sh

################################################################################

[alias]
  # Amend the currently staged files to the latest commit
  amend = commit --amend --reuse-message=HEAD
  # amend = commit --amend -C HEAD

  br = branch

  # Show verbose output
  branches = branch -a

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

  # Commit all changes
  ca = !git add -A && git commit -av

  ci = commit

  co = checkout

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

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

  # 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"

  # `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"

  # Remove branches that have already been merged with master
  # a.k.a. ‘delete merged’
  dm = "!git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d"

  # Find branches containing commit
  fb = "!f() { git branch -a --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"

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

  g = grep

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

  hist = log --graph --pretty=format:'%h %ad | %s%d [%an]' --date=short

  # View abbreviated SHA, description and history graph of the latest 50 commits
  l = log --pretty=oneline -n 50 --graph --abbrev-commit

  last = log -1 HEAD

  lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr, %cn)%Creset' --abbrev-commit --date=relative

  # 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"

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

  # Interactive rebase with the given number of latest commits
  reb = "!r() { git rebase -i HEAD~$1; }; r"
  # git rebase -i --keep-base origin/master
  rebk = "!r() { git rebase -i --keep-base origin/master HEAD~$1; }; r"
  rba = rebase --abort
  rbc = rebase --continue
  rbe = rebase --edit-todo
  rbi = rebase --ignore
  rbs = rebase --skip

  # Show verbose output
  remotes = remote -v

  # 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"

  # View the current working tree status using the short format
  s = status -s

  st = status

  # Show verbose output
  tags = tag -l

  unstage = reset HEAD --
  recent = branch --sort=-committerdate --format=\"%(committerdate:relative)%09%(refname:short)\"

[apply]
  # Detect whitespace errors when applying a patch
  whitespace = fix

[checkout]
  # Always have unspecified checkouts refer to the 'origin' remote
  # Replaces: git checkout --track origin/<name>
  defaultRemote=origin

[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

  # Set editor to open
  editor = emacs #-wl1

[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 # red reverse
  local = cyan
  remote = green

[color "diff"]
  meta = yellow # bold
  frag = magenta # bold # line info
  old = red # deletions
  new = green # additions
  plain = white

[color "status"]
  added = yellow
  changed = green
  untracked = cyan

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

[filter "hawser"]
  clean = git hawser clean %f
  smudge = git hawser smudge %f
  required = true

[filter "media"]
  clean = git media clean %f
  smudge = git media smudge %f
  required = true

[diff]
  # Detect copies as well as renames
  renames = copies
	colorMoved = dimmed-zebra
	colorMovedWs = allow-indentation-change

[gc]
	auto = 0
	reflogExpire = never
	reflogExpireUnreachable = never

[grep]
  lineNumber = true

[help]
  # Automatically correct and execute mistyped commands
  autocorrect = -1

[init]
  # Git Secrets prevents committing secrets & credentials into git repositories.
  # https://github.com/awslabs/git-secrets
  templateDir = /home/jon/.git-templates/git-secrets

[merge]
  # Include summaries of merged commits in newly created merge commit messages
  log = true
  tool = ediff
[mergetool "ediff"]
  # Use Emacs as the mergetool for git
  cmd = emacs --eval \"(ediff-merge-files-with-ancestor \\\"$LOCAL\\\" \\\"$REMOTE\\\" \\\"$BASE\\\" nil \\\"$MERGED\\\")\"

[pull]
  rebase = true

[push]
  # Use the Git 1.x.x default to avoid errors on machines with old Git
  # installations. To use `simple` instead, add this to your `~/.extra` file:
  # `git config --global push.default simple`. See http://git.io/mMah-w.
  # default = matching
  # default = current

# Enable pulling in remote PRs and testing locally with: git checkout pr/999
# See this gist: https://gist.github.com/piscisaureus/3342247
# Comment out the first one when git cloning, as otherwise git raises with
# "fatal: multiple updates for ref 'refs/remotes/origin/master' not allowed"
[remote "origin"]
  fetch = +refs/heads/*:refs/remotes/origin/*
  fetch = +refs/pull/*/head:refs/remotes/origin/pr/*

# Reference Bitcoin PRs easily with refspecs.
# This adds an upstream-pull remote to your git repository, which can be fetched
# using git fetch --all or git fetch upstream-pull. Afterwards, you can use
# upstream-pull/NUMBER/head in arguments to git show, git checkout and anywhere
# a commit id would be acceptable to see the changes from pull request NUMBER.
# [remote "upstream-pull"]
#   fetch = +refs/pull/*:refs/remotes/upstream-pull/*
#   url = git@github.com:bitcoin/bitcoin.git

# Luke Jr: To avoid all the /merge branches, configure the origin-pull remote as
# fetch = +refs/pull/*/head:refs/remotes/origin-pull//head

[rebase]
  autosquash = true

[secrets]
  # Git Secrets patterns, see [init] above.
  patterns = api-key
  patterns = api-secret
  patterns = api_key
  patterns = api_secret

#[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:"