From 3b4d69b9a4d702e4fcdd92e0dd4c22a2410cc627 Mon Sep 17 00:00:00 2001 From: Rob Watson Date: Wed, 17 Mar 2021 07:34:26 +0100 Subject: [PATCH] Use tabs in gitconfig --- gitconfig | 88 +++++++++++++++++++++++++++---------------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/gitconfig b/gitconfig index d8193ab..738dd37 100644 --- a/gitconfig +++ b/gitconfig @@ -1,57 +1,57 @@ [include] - # local and/or misc changes not committed to Git: - path = .gitconfig.local + # local and/or misc changes not committed to Git: + path = .gitconfig.local [alias] - aa = add . - adp = add -p - bn = rev-parse --abbrev-ref HEAD - br = branch - chp = checkout -p - ci = commit - co = checkout - cp = cherry-pick - d = diff - ds = diff --staged - f = fetch - fixup = rebase -i --autosquash - mr = !git merge $(git rb) - nuke = reset --hard - pl = pull - plr = pull --rebase - pr = diff origin/master - prs = diff --stat origin/master - rb = !git rev-parse --abbrev-ref --symbolic-full-name @{u} - rc = rebase --continue - rr = !git reset --hard $(git rb) - shp = show -p - s = status - st = status - undo = reset --soft HEAD^ + aa = add . + adp = add -p + bn = rev-parse --abbrev-ref HEAD + br = branch + chp = checkout -p + ci = commit + co = checkout + cp = cherry-pick + d = diff + ds = diff --staged + f = fetch + fixup = rebase -i --autosquash + mr = !git merge $(git rb) + nuke = reset --hard + pl = pull + plr = pull --rebase + pr = diff origin/master + prs = diff --stat origin/master + rb = !git rev-parse --abbrev-ref --symbolic-full-name @{u} + rc = rebase --continue + rr = !git reset --hard $(git rb) + shp = show -p + s = status + st = status + undo = reset --soft HEAD^ [user] - email = rob@netflux.io - name = Rob Watson + email = rob@netflux.io + name = Rob Watson [core] - editor = vim - quotePath = false - commitGraph = true - pager = delta + editor = vim + quotePath = false + commitGraph = true + pager = delta [color] - ui = auto + ui = auto [pull] - ff = only + ff = only [init] - defaultBranch = development + defaultBranch = development [credential "https://github.com"] - helper = !gh auth git-credential + helper = !gh auth git-credential [diff] - tool = vimdiff + tool = vimdiff [merge] - tool = vimdiff + tool = vimdiff [interactive] - diffFilter = delta --color-only + diffFilter = delta --color-only [delta] - side-by-side = true + side-by-side = true [delta "decorations"] - commit-decoration-style = bold yellow box ul - file-style = bold yellow ul - file-decoration-style = none + commit-decoration-style = bold yellow box ul + file-style = bold yellow ul + file-decoration-style = none