73 lines
1.7 KiB
INI
73 lines
1.7 KiB
INI
[push]
|
|
default = simple
|
|
[user]
|
|
name = Robert Kmieć
|
|
email = KmcR@viessmann.com
|
|
[core]
|
|
editor = nvim
|
|
pager = delta
|
|
autocrlf = false
|
|
excludesfile = /home/rkmiec/.config/git/ignore
|
|
symlinks = true
|
|
#attributesfile = ~/.gitattributes
|
|
[help]
|
|
autocorrect = 1
|
|
[color]
|
|
ui = true
|
|
[grep]
|
|
linenumber = true
|
|
[sendemail]
|
|
smtpencryption = tls
|
|
smtpserver = smtp.gmail.com
|
|
smtpuser = robert.r.kmiec@gmail.com
|
|
smtpserverport = 587
|
|
[merge]
|
|
conflictstyle = diff3
|
|
tool = nfugitive
|
|
[mergetool "nfugitive"]
|
|
cmd = nvim -c "Gvdiffsplit!" "$MERGED"
|
|
[diff]
|
|
tool = nvimdiff
|
|
[difftool "nvimdiff"]
|
|
cmd = nvim -d "$LOCAL" "$REMOTE"
|
|
[diff "markdown"]
|
|
xfuncname = "^#+.*$"
|
|
[filter "lfs"]
|
|
clean = git-lfs clean -- %f
|
|
smudge = git-lfs smudge -- %f
|
|
process = git-lfs filter-process
|
|
required = true
|
|
[alias]
|
|
cm = commit
|
|
co = checkout
|
|
br = branch -vva
|
|
st = status
|
|
d = diff
|
|
dc = diff --cached
|
|
short = rev-parse --short --verify HEAD
|
|
update = !git stash && git pull --rebase && git stash pop && git submodule update --init --recursive
|
|
diff-image = "!f() { cd -- \"${GIT_PREFIX:-.}\"; GIT_DIFF_IMAGE_ENABLED=1 git diff \"$@\"; }; f"
|
|
[interactive]
|
|
diffFilter = delta --color-only
|
|
[delta]
|
|
features = side-by-side line-numbers decorations
|
|
whitespace-error-style = 22 reverse
|
|
[delta "decorations"]
|
|
commit-decoration-style = bold yellow box ul
|
|
file-style = bold yellow ul
|
|
file-decoration-style = none
|
|
[pull]
|
|
rebase = true
|
|
[commit]
|
|
template = .gitmessage
|
|
verbose = true
|
|
[mergetool "vimdiff"]
|
|
cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
|
|
[init]
|
|
defaultBranch = master
|
|
#[diff "image"]
|
|
# command = /home/kmcr/tools/git-diff-image/git_diff_image
|
|
# textconv = imgcat
|
|
[advice]
|
|
detachedHead = false
|