diff --git a/gitconfig b/gitconfig index 9e4fe1a..c5fd8ee 100644 --- a/gitconfig +++ b/gitconfig @@ -2,6 +2,7 @@ # local and/or misc changes not committed to Git: path = .gitconfig.local [alias] + aa = add . adp = add -p br = branch ci = commit @@ -27,17 +28,26 @@ 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 -[core] - pager = delta [interactive] diffFilter = delta --color-only [delta] side-by-side = true -[color] - ui = auto +[delta "decorations"] + commit-decoration-style = bold yellow box ul + file-style = bold yellow ul + file-decoration-style = none