dotfiles/gitconfig

76 lines
1.7 KiB
Plaintext

[include]
# 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
cf = !git commit --fixup $(git log --invert-grep --grep fixup -n1 --oneline --format=format:%h)
ci = commit
cl = clone
cltms = !sh -c 'cd $HOME/dev && git clone $1 && cd $(basename $1 .git) && tmuxsess' --
co = checkout
cob = !git checkout $(git branch | fzf)
cp = cherry-pick
d = diff
dom = diff origin/master
ds = diff --staged
f = fetch
fixup = rebase -i --autosquash
fixom = rebase -i --autosquash origin/master
l = log
mr = !git merge $(git rb)
nb = checkout -b
nuke = reset --hard
p = push
poh = push -u origin HEAD
pl = pull
plr = pull --rebase
pr = diff origin/master
prs = diff --stat origin/master
ra = rebase --abort
rb = !git rev-parse --abbrev-ref --symbolic-full-name @{u}
rc = rebase --continue
re = rebase
rom = rebase origin/master
rr = !git reset --hard $(git rb)
shp = show -p
s = status
sq = merge --squash
sshp = stash show -p
ss = stash save
st = status
undo = reset --soft HEAD^
[user]
email = rob@netflux.io
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
[interactive]
diffFilter = delta --color-only
[delta]
side-by-side = true
plus-style = 'syntax "#142e20"'
zero-style = 'syntax "#1d1f21" dim'
minus-style = 'syntax "#36181d"'
commit-decoration-style = bold yellow box ul
file-style = bold yellow ul
file-decoration-style = none