.gitconfig

[user]
    name = <name>
    email = <email>
[color]
    # Enable colors in color-supporting terminals
    ui = auto
[alias]
    st = status
    ci = commit
    co = checkout
    rebase-master = rebase --interactive --autosquash origin/master
    rebase-main = rebase --interactive --autosquash origin/main
    lg = log --graph --date=relative --pretty=tformat:'%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%an %ad)%Creset'
    oops = commit --amend --no-edit
    review-local = "!git lg @{push}.."
    # Or pre 2.5, as we didn't differential push and upstream in shorthands:
    # review-local = lg @{upstream}..
[core]
    excludesfile = ~/.gitignore_global
    autocrlf = input
    # Don't paginate output by default
    pager = cat
    #
    editor = /usr/bin/vim
    #
    # Don't consider trailing space change as a cause for merge conflicts
    whitespace = -trailing-space
[diff]
    # Use better, descriptive initials (c, i, w) instead of a/b.
    mnemonicPrefix = true
    # Show renames/moves as such
    renames = true
    # When using --word-diff, assume --word-diff-regex=.
    wordRegex = .
    # Display submodule-related information (commit listings)
    submodule = log
    tool = icdiff
[difftool]
    prompt = false
[difftool "icdiff"]
    cmd = /usr/local/bin/icdiff --line-numbers $LOCAL $REMOTE
[fetch]
    # Auto-fetch submodule changes (sadly, won't auto-update)
    recurseSubmodules = on-demand
[grep]
    # Consider most regexes to be ERE
    extendedRegexp = true
[log]
    # Use abbrev SHAs whenever possible/relevant instead of full 40 chars
    abbrevCommit = true
    # Automatically --follow when given a single path
    follow = true
[merge]
    # Display common-ancestor blocks in conflict hunks
    conflictStyle = diff3
[mergetool]
    # Clean up backup files created by merge tools on tool exit
    keepBackup = false
    # Clean up temp files created by merge tools on tool exit
    keepTemporaries = false
    # Put the temp files in a dedicated dir anyway
    writeToTemp = true
    # Auto-accept file prompts when launching merge tools
    prompt = false
[pull]
    # This is GREAT… when you know what you're doing and are careful
    # not to pull --no-rebase over a local line containing a true merge.
    # rebase = true
    # WARNING! This option, which does away with the one gotcha of
    # auto-rebasing on pulls, is only available from 1.8.5 onwards.
    rebase = preserve
[push]
    #default = simple
    # Default push should only push the current branch to its push target, regardless of its remote name
    default = upstream
    # When pushing, also push tags whose commit-ishs are now reachable upstream
    followTags = true
[status]
    # Display submodule rev change summaries in status
    submoduleSummary = true
    # Recursively traverse untracked directories to display all contents
    showUntrackedFiles = all
[color "branch"]
    # Blue on black is hard to read in git branch -vv: use cyan instead
    upstream = cyan
[tag]
    # Sort tags as version numbers whenever applicable, so 1.10.2 is AFTER 1.2.0.
    sort = version:refname
[versionsort]
    prereleaseSuffix = -pre
    prereleaseSuffix = .pre
    prereleaseSuffix = -beta
    prereleaseSuffix = .beta
    prereleaseSuffix = -rc
    prereleaseSuffix = .rc
[filter "media"]
    required = true
    clean = git media clean %f
    smudge = git media smudge %f
[difftool "sourcetree"]
    cmd = opendiff \"$LOCAL\" \"$REMOTE\"
    path =
[mergetool "sourcetree"]
    cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
    trustExitCode = true
[commit]
    template = ~/.stCommitMsg