2021-03-15 14:18:21 +00:00
|
|
|
[include]
|
|
|
|
|
# local and/or misc changes not committed to Git:
|
|
|
|
|
path = .gitconfig.local
|
|
|
|
|
[alias]
|
2021-03-15 15:44:05 +00:00
|
|
|
aa = add .
|
2021-03-15 14:18:21 +00:00
|
|
|
adp = add -p
|
2021-03-16 08:00:59 +00:00
|
|
|
bn = rev-parse --abbrev-ref HEAD
|
2021-03-15 14:18:21 +00:00
|
|
|
br = branch
|
2021-03-16 08:00:59 +00:00
|
|
|
chp = checkout -p
|
2021-03-15 14:18:21 +00:00
|
|
|
ci = commit
|
|
|
|
|
co = checkout
|
|
|
|
|
cp = cherry-pick
|
|
|
|
|
d = diff
|
|
|
|
|
ds = diff --staged
|
|
|
|
|
f = fetch
|
|
|
|
|
fixup = rebase -i --autosquash
|
2021-03-16 08:00:59 +00:00
|
|
|
mr = !git merge $(git rb)
|
2021-03-15 14:18:21 +00:00
|
|
|
nuke = reset --hard
|
2021-03-16 08:00:59 +00:00
|
|
|
pl = pull
|
|
|
|
|
plr = pull --rebase
|
|
|
|
|
pr = diff origin/master
|
|
|
|
|
prs = diff --stat origin/master
|
|
|
|
|
rb = !git rev-parse --abbrev-ref --symbolic-full-name @{u}
|
2021-03-15 14:18:21 +00:00
|
|
|
rc = rebase --continue
|
2021-03-16 08:00:59 +00:00
|
|
|
rr = !git reset --hard $(git rb)
|
2021-03-15 14:18:21 +00:00
|
|
|
shp = show -p
|
2021-03-16 08:00:59 +00:00
|
|
|
s = status
|
2021-03-15 14:18:21 +00:00
|
|
|
st = status
|
|
|
|
|
undo = reset --soft HEAD^
|
|
|
|
|
[user]
|
|
|
|
|
email = rob@netflux.io
|
|
|
|
|
name = Rob Watson
|
|
|
|
|
[core]
|
|
|
|
|
editor = vim
|
2021-03-16 08:00:59 +00:00
|
|
|
quotePath = false
|
|
|
|
|
commitGraph = true
|
2021-03-15 15:44:05 +00:00
|
|
|
pager = delta
|
|
|
|
|
[color]
|
|
|
|
|
ui = auto
|
|
|
|
|
[pull]
|
2021-03-16 08:00:59 +00:00
|
|
|
ff = only
|
2021-03-15 15:44:05 +00:00
|
|
|
[init]
|
2021-03-16 08:00:59 +00:00
|
|
|
defaultBranch = development
|
2021-03-15 14:18:21 +00:00
|
|
|
[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
|
2021-03-15 15:44:05 +00:00
|
|
|
[delta "decorations"]
|
|
|
|
|
commit-decoration-style = bold yellow box ul
|
|
|
|
|
file-style = bold yellow ul
|
|
|
|
|
file-decoration-style = none
|
