[include] # local and/or misc changes not committed to Git: path = .gitconfig.local [alias] aa = add . adp = add -p br = branch ci = commit co = checkout cp = cherry-pick d = diff ds = diff --staged f = fetch fixup = rebase -i --autosquash nuke = reset --hard rc = rebase --continue shp = show -p st = status undo = reset --soft HEAD^ bn = rev-parse --abbrev-ref HEAD chp = checkout -p pl = pull pr = diff origin/master prs = diff --stat origin/master rr = !git reset --hard $(git rev-parse --abbrev-ref --symbolic-full-name @{u}) [user] email = rob@netflux.io name = Rob Watson [core] editor = vim quotePath = false commitGraph = true pager = delta [color] ui = auto [pull] ff = only [init] defaultBranch = development [credential "https://github.com"] helper = !gh auth git-credential [diff] tool = vimdiff [merge] tool = vimdiff [interactive] diffFilter = delta --color-only [delta] side-by-side = true [delta "decorations"] commit-decoration-style = bold yellow box ul file-style = bold yellow ul file-decoration-style = none