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
|
2021-03-21 15:10:06 +00:00
|
|
|
cl = clone
|
2021-04-08 08:53:27 +00:00
|
|
|
cltms = !sh -c 'cd $HOME/dev && git clone $1 && cd $(basename $1 .git) && tmuxsess' --
|
2021-03-17 06:34:26 +00:00
|
|
|
co = checkout
|
|
|
|
|
cp = cherry-pick
|
|
|
|
|
d = diff
|
|
|
|
|
ds = diff --staged
|
|
|
|
|
f = fetch
|
|
|
|
|
fixup = rebase -i --autosquash
|
2021-04-22 09:41:53 +00:00
|
|
|
fixom = rebase -i --autosquash origin/master
|
2021-03-17 06:34:26 +00:00
|
|
|
mr = !git merge $(git rb)
|
2021-04-22 09:41:53 +00:00
|
|
|
nb = checkout -b
|
2021-03-17 06:34:26 +00:00
|
|
|
nuke = reset --hard
|
2021-04-13 15:59:03 +00:00
|
|
|
p = push
|
|
|
|
|
poh = push -u origin HEAD
|
2021-03-17 06:34:26 +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}
|
|
|
|
|
rc = rebase --continue
|
|
|
|
|
rr = !git reset --hard $(git rb)
|
|
|
|
|
shp = show -p
|
|
|
|
|
s = status
|
2021-03-26 16:24:46 +00:00
|
|
|
sq = merge --squash
|
2021-03-18 08:05:37 +00:00
|
|
|
ss = stash save
|
2021-03-17 06:34:26 +00:00
|
|
|
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-29 13:09:50 +00:00
|
|
|
plus-style = 'syntax "#142e20"'
|
|
|
|
|
zero-style = 'syntax "#1d1f21" dim'
|
|
|
|
|
minus-style = 'syntax "#36181d"'
|
2021-03-17 06:34:26 +00:00
|
|
|
commit-decoration-style = bold yellow box ul
|
|
|
|
|
file-style = bold yellow ul
|
|
|
|
|
file-decoration-style = none
|
