.gitconfig

[alias]
    a = add
    c = commit -S
    m = checkout master
    pf = push --force-with-lease
    s = status -s
    tags = tag -l
    branches = branch -a
    remotes = remote -v
    up = "!git remote update -p; git merge --ff-only @{u}"

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

[core]
    # 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,trailing-space

    editor = nvim

[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
    old = red
    new = green
[color "status"]
    added = yellow
    changed = green
    untracked = cyan
[color "diff-highlight"]
    oldNormal = red bold
    oldHighlight = red bold 52
    newNormal = green bold
    newHighlight = green bold 22

[diff]
    # Detect copies as well as renames
    renames = copies
[diff "bin"]
    # Use `hexdump` to diff binary files
    textconv = hexdump -v -C

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

[merge]
    # Include summaries of merged commits in newly created merge commit messages
    log = 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

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

[credential]
  helper = cache --timeout=3600

[pager]
  diff = diff-so-fancy | less --tabs=1,5 -RFX
  show = diff-so-fancy | less --tabs=1,5 -RFX