gitconfig

[alias]
  a        = add
  alias    = config --get-regexp '^alias.'
  amend    = commit --amend --verbose
  br       = branch --verbose
  bra      = branch --all --verbose
  brd      = branch --delete
  brmv     = branch --move
  brrd     = push origin --delete
  c        = commit
  co       = checkout
  df       = diff
  dfsg     = diff --staged
  dfstsh   = stash show --patch
  fixup    = commit --fixup
  l        = log --date=short --format='%C(auto,yellow)%h%C(reset) %C(auto,brightblue)%cd%C(reset) %s %C(auto)%d'
  ll       = log --stat
  lfz      = "! f() { \
                  git l --color=always "$@" \
                  | fzf \
                      --ansi \
                      --preview='git show --color=always {1} | delta' \
                      --bind='enter:execute(git show {1})' \
                      --bind='ctrl-y:execute-silent(echo {1} | pbcopy)+abort' \
                  ; \
                }; f \
           "
  pf       = push --force-with-lease
  rba      = rebase --abort
  rbc      = rebase --continue
  rbi      = rebase --interactive
  rmt      = remote --verbose
  s        = "! f() { rg --hidden --smart-case --json "\"$@\"" | delta; }; f"
  sfz      = "! f() { \
                  RG_PREFIX='rg --color=always --column --no-heading --line-number --hidden --smart-case'; \
                  : | fzf \
                        --ansi --disabled \
                        --query=${*:-} \
                        --delimiter=: --nth=1,2 --with-nth=1,2 \
                        --preview='bat --color=always --highlight-line={2} {1}' \
                        --preview-window='+{2}-/2' \
                        --bind=\"start:reload:$RG_PREFIX {q}\" \
                        --bind=\"change:reload:$RG_PREFIX {q} || true\" \
                        --bind='enter:become(nvim {1} +{2})' \
                  ; \
                }; f \
           "
  st       = status --short --branch
  stsh     = stash --staged
  stsha    = stash --include-untracked
  sw       = switch
  uncommit = reset HEAD~1
  undo     = restore
  unstage  = restore --staged
[commit]
  template = ~/.config/git/commit
[core]
  autocrlf     = input
  excludesfile = ~/.config/git/ignore
  pager        = delta
[delta]
  grep-output-type = ripgrep
  line-numbers     = true
  navigate         = true
  syntax-theme     = Nord
[delta "interactive"]
  color-only              = true
  keep-plus-minus-markers = false
[diff]
  tool       = nvimdiff
  colormoved = default
[difftool]
  prompt = false
[difftool "nvimdiff"]
  cmd = nvim -d $LOCAL $REMOTE
[fetch]
  prune     = true
  prunetags = true
[init]
  defaultbranch = master
  templatedir = ~/.config/git/templates
[interactive]
  difffilter = delta --features=interactive
[merge]
  ff            = only
  tool          = nvimdiff
  conflictstyle = diff3
[mergetool]
  prompt = false
[mergetool "nvimdiff"]
  cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
[pull]
  ff = only
[push]
  default = current
[rebase]
  autosquash = true
[user]
  email = mail@cbjohnson.io
  name  = Charles B Johnson
[include]
  path = ~/.config/dotfile/gitconfig.local
[include]
  path = ~/.config/dotfile/gitconfig.secret