dotfiles/gitconfig

58 lines
1.1 KiB
Plaintext
Raw Normal View History

2021-03-15 14:18:21 +00:00
[include]
2021-03-17 06:34:26 +00:00
# local and/or misc changes not committed to Git:
path = .gitconfig.local
2021-03-15 14:18:21 +00:00
[alias]
2021-03-17 06:34:26 +00:00
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^
2021-03-15 14:18:21 +00:00
[user]
2021-03-17 06:34:26 +00:00
email = rob@netflux.io
name = Rob Watson
2021-03-15 14:18:21 +00:00
[core]
2021-03-17 06:34:26 +00:00
editor = vim
quotePath = false
commitGraph = true
pager = delta
2021-03-15 15:44:05 +00:00
[color]
2021-03-17 06:34:26 +00:00
ui = auto
2021-03-15 15:44:05 +00:00
[pull]
2021-03-17 06:34:26 +00:00
ff = only
2021-03-15 15:44:05 +00:00
[init]
2021-03-17 06:34:26 +00:00
defaultBranch = development
2021-03-15 14:18:21 +00:00
[credential "https://github.com"]
2021-03-17 06:34:26 +00:00
helper = !gh auth git-credential
2021-03-15 14:18:21 +00:00
[diff]
2021-03-17 06:34:26 +00:00
tool = vimdiff
2021-03-15 14:18:21 +00:00
[merge]
2021-03-17 06:34:26 +00:00
tool = vimdiff
2021-03-15 14:18:21 +00:00
[interactive]
2021-03-17 06:34:26 +00:00
diffFilter = delta --color-only
2021-03-15 14:18:21 +00:00
[delta]
2021-03-17 06:34:26 +00:00
side-by-side = true
2021-03-15 15:44:05 +00:00
[delta "decorations"]
2021-03-17 06:34:26 +00:00
commit-decoration-style = bold yellow box ul
file-style = bold yellow ul
file-decoration-style = none