158 lines
4.0 KiB
Plaintext
158 lines
4.0 KiB
Plaintext
[alias]
|
|
st = status
|
|
co = checkout
|
|
fx = commit --fixup=HEAD
|
|
ci = commit -v
|
|
cm = commit -m
|
|
ri = rebase -i --autosquash
|
|
wc = whatchanged
|
|
ass = add
|
|
amend = commit --amend -v
|
|
full = show --format=fuller
|
|
noed = commit --amend --no-edit
|
|
tr = log --graph --date-order --date=short --pretty=format:'%C(cyan)%h %C(blue)%ar%C(auto)%d %C(yellow)%s%+b %C(black)%ae'
|
|
fz = !sha=$( git -c color.ui=always log --oneline -n 1000 | fzf +s --no-multi --prompt 'Fixup> ' ) && git commit --fixup "${sha%% *}"
|
|
fr = !sha=$( git -c color.ui=always log --oneline -n 1000 | fzf +s --no-multi --prompt 'Revert> ' ) && git revert "${sha%% *}"
|
|
wd = "!f() { git --paginate diff --dirstat=cumulative,files,0 ${1:-HEAD} | awk '{print $2}' | cut -d / -f1-${2:-4} | sort | uniq; }; f"
|
|
|
|
[http]
|
|
sslVerify = true
|
|
|
|
[core]
|
|
editor = nvr --remote-wait-silent
|
|
autocrlf = input
|
|
whitespace = warn
|
|
excludesfile = /home/deadguy/.config/git/gitignore
|
|
pager = "{ \
|
|
COLUMNS=$(tput cols); \
|
|
if [ $COLUMNS -ge 80 ] && [ -z $FZF_PREVIEW_COLUMNS ]; then \
|
|
delta --side-by-side -w $COLUMNS; \
|
|
elif [ $COLUMNS -ge 160 ] && [ ! -z $FZF_PREVIEW_COLUMNS ]; then \
|
|
delta --side-by-side -w $FZF_PREVIEW_COLUMNS; \
|
|
else \
|
|
delta; \
|
|
fi \
|
|
}"
|
|
|
|
[interactive]
|
|
diffFilter = delta --color-only
|
|
|
|
[delta]
|
|
side-by-side = false
|
|
line-numbers = true
|
|
syntax-theme = gruvbox
|
|
hunk-header-style = omit
|
|
file-style = blue
|
|
file-decoration-style = blue ul ol
|
|
zero-style = dim syntax
|
|
minus-non-emph-style = dim red
|
|
minus-emph-style = bold red 52
|
|
minus-empty-line-marker-style = normal "#3f0001"
|
|
plus-non-emph-style = dim green
|
|
plus-emph-style = bold green 22
|
|
plus-empty-line-marker-style = normal "#002800"
|
|
whitespace-error-style = reverse white
|
|
file-added-label = [+]
|
|
file-copied-label = [C]
|
|
file-modified-label = [M]
|
|
file-removed-label = [-]
|
|
file-renamed-label = [R]
|
|
line-numbers-left-format = "{nm:>1} "
|
|
line-numbers-right-format = "{np:>1} "
|
|
line-numbers-minus-style = red italic
|
|
line-numbers-plus-style = green italic
|
|
|
|
[delta "flashy"]
|
|
side-by-side = true
|
|
line-numbers = true
|
|
decorations = true
|
|
syntax-theme = dracula
|
|
plus-style = syntax "#003800"
|
|
minus-style = syntax "#3f0001"
|
|
commit-decoration-style = bold yellow box ul
|
|
file-style = bold yellow ul
|
|
file-decoration-style = none
|
|
hunk-header-decoration-style = cyan box ul
|
|
line-numbers-left-style = cyan
|
|
line-numbers-right-style = cyan
|
|
line-numbers-minus-style = 124
|
|
line-numbers-plus-style = 28
|
|
|
|
[web]
|
|
browser = firefox
|
|
|
|
[credential]
|
|
helper = /usr/libexec/git-core/git-credential-libsecret
|
|
|
|
[merge]
|
|
tool = nvim
|
|
|
|
[mergetool "nvim"]
|
|
cmd = nvim -f -c \"Gdiffsplit!\" \"$MERGED\"
|
|
|
|
[mergetool]
|
|
prompt = false
|
|
|
|
[diff]
|
|
tool = nvr
|
|
colorMoved = default
|
|
|
|
[difftool "nvr"]
|
|
cmd = nvr -s -d $LOCAL $REMOTE
|
|
|
|
[commit]
|
|
gpgsign = true
|
|
verbose = true
|
|
|
|
[status]
|
|
branch = true
|
|
|
|
[color]
|
|
diff = auto
|
|
status = auto
|
|
branch = auto
|
|
ui = true
|
|
|
|
[rerere]
|
|
enabled = true
|
|
|
|
[grep]
|
|
lineNumber = true
|
|
extendRegexp = true
|
|
|
|
[color "branch"]
|
|
remote = red bold
|
|
current = yellow bold
|
|
local = yellow
|
|
[color "status"]
|
|
added = yellow bold
|
|
changed = red bold
|
|
untracked = red
|
|
header = cyan bold
|
|
branch = yellow bold
|
|
[color "grep"]
|
|
separator = green bold
|
|
filename = green
|
|
linenumber = blue bold
|
|
[color "diff"]
|
|
meta = yellow
|
|
frag = magenta bold
|
|
commit = yellow bold
|
|
old = red bold
|
|
new = green bold
|
|
whitespace = red reverse
|
|
[color "diff-highlight"]
|
|
oldNormal = red bold
|
|
oldHighlight = red bold 52
|
|
newNormal = green bold
|
|
newHighlight = green bold 22
|
|
|
|
[gpg]
|
|
program = gpg2
|
|
|
|
[log]
|
|
decorate = short
|
|
|
|
[include]
|
|
path = config.local
|