.gitconfig

 # I incorporated a lot of tips from:
 # https://gist.github.com/scottnonnenberg/fefa3f65fdb3715d25882f3023b31c29
 
[user]
    name = B. J. Potter
    email = bjpotter@gmail.com
    signingkey = ABBF3069002C5AE3
    
[commit]
	gpgsign = true
    # "other people can trust that the changes you've made really were made by you"
    # https://help.github.com/articles/about-gpg/
    # https://git-scm.com/docs/git-config#git-config-commitgpgSign

[core]
    editor = vim
    autocrlf = false
    safecrlf = true
    pager = less -FRSX

[diff]
    tool = meld

[difftool]
    prompt = false

[alias]
    br = for-each-ref --sort=committerdate refs/heads/ --format='%(HEAD)%(color:yellow)%(refname:short)%(color:reset) - %(color:red)%(objectname:short)%(color:reset) - %(contents:subject) - %(authorname) (%(color:green)%(committerdate:relative)%(color:reset))'
    co = checkout
    ci = commit
    dump = cat-file -p
    type = cat-file -t
    st = status

    hist = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'
    # No need for a GUI - a nice, colorful, graphical representation
    # https://git-scm.com/docs/git-log
    # via https://medium.com/@payload.dd/thanks-for-the-git-st-i-will-use-this-4da5839a21a4
    
    stash-all = stash save --include-untracked
    # We wanna grab those pesky un-added files!
    # https://git-scm.com/docs/git-stash
    
    undo = reset --soft HEAD^
    # Not quite as common as an amend, but still common
    # https://git-scm.com/docs/git-reset#git-reset-emgitresetemltmodegtltcommitgt

[color]
    branch = auto
    diff = auto
    status = auto

[color "branch"]
    current = yellow reverse
    local = yellow 
    remote = green

[color "diff"]
    meta = yellow bold
    frag = magenta bold
    old = red bold
    new = green bold

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

[merge]
    tool = meld
    ff = only
    # I pretty much never mean to do a real merge, since I use a rebase workflow.
    # Note: this global option applies to all merges, including those done during a git pull
    # https://git-scm.com/docs/git-config#git-config-mergeff
    
    conflictstyle = diff3
    # Standard diff is two sets of final changes. This introduces the original text before each side's changes.
    # https://git-scm.com/docs/git-config#git-config-mergeconflictStyle
[push]
    default = simple
    # "push the current branch back to the branch whose changes are usually integrated into the current branch"
    # "refuse to push if the upstream branch’s name is different from the local one"
    # https://git-scm.com/docs/git-config#git-config-pushdefault
    
	followTags = true
    # Because I get sick of telling git to do it manually
    # https://git-scm.com/docs/git-config#git-config-pushfollowTags
    
[status]
	showUntrackedFiles = all
    # Sometimes a newly-added folder, since it's only one line in git status, can slip under the radar.
    # https://git-scm.com/docs/git-config#git-config-statusshowUntrackedFiles
    
[transfer]
	fsckobjects = true
    # To combat repository corruption!
    # Note: this global option applies during receive and transmit
    # https://git-scm.com/docs/git-config#git-config-transferfsckObjects
    # via https://groups.google.com/forum/#!topic/binary-transparency/f-BI4o8HZW0