Add Git configuration files

This commit is contained in:
Rob Watson 2021-03-15 15:18:21 +01:00
parent 77798b5bdb
commit c90f517bb5
2 changed files with 47 additions and 0 deletions

43
gitconfig Normal file
View File

@ -0,0 +1,43 @@
[include]
# local and/or misc changes not committed to Git:
path = .gitconfig.local
[alias]
adp = add -p
br = branch
ci = commit
co = checkout
cp = cherry-pick
d = diff
ds = diff --staged
f = fetch
fixup = rebase -i --autosquash
nuke = reset --hard
rc = rebase --continue
shp = show -p
st = status
undo = reset --soft HEAD^
bn = rev-parse --abbrev-ref HEAD
chp = checkout -p
pl = pull
pr = diff origin/master
prs = diff --stat origin/master
rr = !git reset --hard $(git rev-parse --abbrev-ref --symbolic-full-name @{u})
[user]
email = rob@netflux.io
name = Rob Watson
[core]
editor = vim
[credential "https://github.com"]
helper = !gh auth git-credential
[diff]
tool = vimdiff
[merge]
tool = vimdiff
[core]
pager = delta
[interactive]
diffFilter = delta --color-only
[delta]
side-by-side = true
[color]
ui = auto

4
gitignore Normal file
View File

@ -0,0 +1,4 @@
# $HOME/.config/git/ignore
# Ignore all .tool-versions files, unless added explicitly:
.tool-versions