2020-03-08 18:58:52 +00:00
|
|
|
[core]
|
|
|
|
|
autocrlf = input
|
|
|
|
|
editor = nvim
|
2020-03-31 20:32:43 +00:00
|
|
|
[submodule]
|
|
|
|
|
recurse = true
|
|
|
|
|
[rerere]
|
|
|
|
|
enabled = true
|
|
|
|
|
# Accelerate packing by automatically determining thread count
|
|
|
|
|
[pack]
|
|
|
|
|
threads = 0
|
|
|
|
|
|
2020-06-03 10:26:15 +00:00
|
|
|
[diff]
|
|
|
|
|
tool = nvim
|
|
|
|
|
[merge]
|
|
|
|
|
tool = nvim
|
|
|
|
|
[mergetool "nvim"]
|
|
|
|
|
cmd = nvim -f -c \"Gdiffsplit!\" \"$MERGED\"
|
|
|
|
|
prompt = false
|
|
|
|
|
[difftool "nvim"]
|
|
|
|
|
cmd = "nvim -d \"$LOCAL\" \"$REMOTE\""
|
|
|
|
|
|
2020-03-31 20:32:43 +00:00
|
|
|
# Automatically push to branch with matching name
|
2020-03-08 18:58:52 +00:00
|
|
|
[push]
|
|
|
|
|
default = current
|
2020-03-31 20:32:43 +00:00
|
|
|
# Disable pagination for branch commmand by default
|
2020-03-08 18:58:52 +00:00
|
|
|
[pager]
|
|
|
|
|
branch = false
|
2020-03-31 20:32:43 +00:00
|
|
|
[grep]
|
2020-06-03 10:26:15 +00:00
|
|
|
lineNumber = 1
|
2020-03-31 20:32:43 +00:00
|
|
|
|
2020-03-08 18:58:52 +00:00
|
|
|
[color "status"]
|
|
|
|
|
added = green
|
|
|
|
|
changed = yellow
|
2020-03-31 20:32:43 +00:00
|
|
|
untracked = magenta
|
|
|
|
|
|
|
|
|
|
[user]
|
|
|
|
|
email = 27jf@pm.me
|
2020-06-03 10:26:15 +00:00
|
|
|
name = xerus2000
|
2020-03-31 20:32:43 +00:00
|
|
|
|
2020-03-08 18:58:52 +00:00
|
|
|
[alias]
|
2020-06-03 10:26:15 +00:00
|
|
|
st = status -sb
|
|
|
|
|
stv = --paginate status -v
|
2020-06-03 10:31:25 +00:00
|
|
|
stvv = --paginate status -vv
|
2020-06-08 09:42:34 +00:00
|
|
|
l = !git --no-pager log --pretty=tformat:'%C(auto)%h -%d %s %Cgreen(%cr) %Cblue<%an>%Creset' -5
|
2020-06-03 10:26:15 +00:00
|
|
|
|
|
|
|
|
unstage = reset HEAD --
|
|
|
|
|
ready = rebase -i @{u}
|
|
|
|
|
|
2020-03-08 18:58:52 +00:00
|
|
|
curbranch = symbolic-ref --short HEAD
|
|
|
|
|
root = rev-parse --show-toplevel
|
2020-06-08 09:42:34 +00:00
|
|
|
dir = !git root | sed 's/$/\\/.git/' | grep --color=never "/" # grep ensures a proper exit status on fail
|
2020-03-31 20:32:43 +00:00
|
|
|
|
2020-03-08 18:58:52 +00:00
|
|
|
[filter "lfs"]
|
2020-03-31 20:32:43 +00:00
|
|
|
clean = git-lfs clean -- %f
|
2020-03-08 18:58:52 +00:00
|
|
|
smudge = git-lfs smudge -- %f
|
|
|
|
|
process = git-lfs filter-process
|
2020-06-03 10:26:15 +00:00
|
|
|
required = true
|
2020-06-08 09:42:34 +00:00
|
|
|
[pull]
|
|
|
|
|
ff = only
|
