.gitconfig

.gitconfig

[user]
  email = 1294877+KraigWalker@users.noreply.github.com
  name = Kraig Walker

[alias]
  # The best utility for cleaning outdated branches. It will connect to a
  # shared remote repository and fetch all remote branch refs. It will then
  # delete remote refs that are no longer in use on the remote repository.
  # https://git-scm.com/docs/git-fetch/#git-fetch--p
  prune = fetch --prune


  # A soft reset will only reset the Commit History.
  # When the --soft argument is passed, the ref pointers are updated and the 
  # reset stops there. The Staging Index and the Working Directory are left untouched
  # Not quite as common as an amend, but still common
  # https://git-scm.com/docs/git-reset#git-reset-emgitresetemlmodegtlcommitgit
  undo = reset --soft HEAD^
  
  # Grab all those pesky un-added files when stashing our work away quickly.
  # https://git-scm.com/docs/git-stash
  stash-all = stash save --include-untracked
  
  # 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
  glog = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'
  
[merge]
  # 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
  conflictstyle = diff3

[commit]
  # "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-commitgpgSig
  gpgSign = true

[push]


[diff]
  # Improved Colour Diff (icdiff)
  # A nice little github-like colorful, split diff right in the console.
  # via https://owen.cymru/github-style-diff-in-terminal-with-icdiff-2/
  tool = icdiff

[difftool]
  prompt = false