gitconfig

[include]
    path = .gituser

[core]
    editor = vim
	excludesfile = ~/.gitignore

[color]
    ui = true

[alias]
    # Branch controls
    co = checkout
    cob = checkout -b
    b = branch -vv

    # What do things look like at the moment?
    st = status
    di = diff
    dc = diff --cached
    ds = diff --stat=160,120
    dh1 = diff HEAD~1

    # Make and rearrange commits
    ci = commit
    amend = commit --amend
    ane = commit --amend --no-edit
    aa = add --all
    ri = rebase --interactive

    # Special merges:
    ff = merge --ff-only
    puff = pull --ff-only
    noff = merge --no-ff

    # Update tracking info
    fa = fetch --all
    rup = remote update --prune

    # Update remotes
    po = push origin
    pom = push origin main --tags
    pod = push origin develop

    # Requires semver, which is non-standard.
    sv = semver-tags

    # for `hub`
    prq = pull-request

    # Checkpoint: save current state with a UUID for a commit message. Commit
    # early, commit often, interactive rebase, push late.
    checkpoint = "!. ~/.githelpers && git_checkpoint"
    ch = !git checkpoint

    # Divergence (commits we added and commits remote added)
    div = divergence

    # Fancy logging.
    #   h = head
    #   hp = head with patch
    #   r = recent commits, only current branch
    #   ra = recent commits, all reachable refs
    #   l = all commits, only current branch
    #   la = all commits, all reachable refs
    head = !git l -1
    h = !git head
    hp = "!. ~/.githelpers && show_git_head"
    r = !git l -20
    ra = !git r --all
    l = "!. ~/.githelpers && pretty_git_log"
    la = !git l --all

[advice]
    detachedHead = true

[pager]
	diff = diff-so-fancy | less --tabs=4 -RFX
	show = diff-so-fancy | less --tabs=4 -RFX

[push]
    default = simple

[merge]
    defaultToUpstream = true
    tool = vimdiff

[branch]
    autosetupmerge = always

[rerere]
    enabled = true

[pager]
    branch = false

[github]
    user = wlonk

[ghi]
    token = !security find-internet-password -a wlonk -s github.com -l 'ghi token' -w

[gpg]
    program = /usr/local/MacGPG2/bin/gpg2

[diff-so-fancy]
	first-run = false

[url "ssh://git@github.com/"]
  insteadOf = https://github.com/
[init]
	defaultBranch = main