2019-05-28 17:44:30 +02:00
|
|
|
[user]
|
|
|
|
email = chronobserver@disroot.org
|
|
|
|
name = ObserverOfTime
|
|
|
|
signingkey = 8A2DEA1DBAEBCA9E
|
|
|
|
|
|
|
|
[core]
|
|
|
|
editor = ${EDITOR:-nvim}
|
2019-09-25 20:07:56 +02:00
|
|
|
pager = ${PAGER:-nvimpager}
|
2019-05-28 17:44:30 +02:00
|
|
|
whitespace = tabwidth=4,cr-at-eol
|
|
|
|
|
2020-04-25 21:12:40 +02:00
|
|
|
[advice]
|
|
|
|
detachedHead = false
|
|
|
|
|
2019-05-28 17:44:30 +02:00
|
|
|
[credential]
|
|
|
|
helper = store
|
|
|
|
|
|
|
|
[commit]
|
2020-03-23 12:23:14 +01:00
|
|
|
gpgSign = true
|
2019-05-28 17:44:30 +02:00
|
|
|
status = true
|
|
|
|
|
2020-07-15 17:51:59 +02:00
|
|
|
[pull]
|
|
|
|
ff = only
|
|
|
|
|
2019-05-28 17:44:30 +02:00
|
|
|
[status]
|
|
|
|
submoduleSummary = 1
|
|
|
|
|
2020-04-25 21:12:40 +02:00
|
|
|
[tar "tar.gz"]
|
|
|
|
command = gzip -c -f -n
|
|
|
|
|
|
|
|
[tar "tgz"]
|
|
|
|
command = gzip -c -f -n
|
|
|
|
|
|
|
|
[tar "tar.bz2"]
|
|
|
|
command = bzip2 -c -f
|
|
|
|
|
|
|
|
[tar "tar.xz"]
|
|
|
|
command = xz -c -z -
|
|
|
|
|
2020-07-15 17:51:59 +02:00
|
|
|
[pull]
|
|
|
|
ff = only
|
2020-04-25 21:12:40 +02:00
|
|
|
[tar "tar.zst"]
|
|
|
|
command = zstd -c -z -q -
|
|
|
|
|
|
|
|
[tar "tar.lz"]
|
|
|
|
command = lzip -c -f
|
|
|
|
|
|
|
|
[tar "tar.lz4"]
|
|
|
|
command = lz4 -q
|
|
|
|
|
2019-05-28 17:44:30 +02:00
|
|
|
[color "diff"]
|
|
|
|
meta = yellow
|
|
|
|
|
|
|
|
[diff]
|
|
|
|
algorithm = patience
|
|
|
|
wsErrorHighlight = all
|
|
|
|
mnemonicPrefix = true
|
|
|
|
|
|
|
|
[diff "hex"]
|
|
|
|
textconv = hexdump -v -C
|
|
|
|
|
|
|
|
[diff "pdf"]
|
|
|
|
textconv = pdfinfo
|
|
|
|
|
|
|
|
[difftool]
|
|
|
|
prompt = false
|
|
|
|
|
2020-01-20 08:03:32 +01:00
|
|
|
[difftool "meld"]
|
|
|
|
cmd = meld "$REMOTE" "$LOCAL"
|
|
|
|
|
2019-05-28 17:44:30 +02:00
|
|
|
[difftool "imgdiff"]
|
|
|
|
cmd = compare "$REMOTE" "$LOCAL" png:- | \
|
|
|
|
montage -geometry 400x -font \
|
|
|
|
Liberation-Sans -label "l/%f" "$LOCAL" \
|
|
|
|
-label "diff" - -label "r/%f" "$REMOTE" x:
|
|
|
|
|
|
|
|
[merge]
|
|
|
|
tool = fugitive
|
|
|
|
|
2019-06-11 15:44:42 +02:00
|
|
|
[mergetool]
|
|
|
|
keepBackup = false
|
|
|
|
|
2019-05-28 17:44:30 +02:00
|
|
|
[mergetool "fugitive"]
|
2019-09-25 20:07:56 +02:00
|
|
|
cmd = nvim -f -c \"Gvdiffsplit!\" \"$MERGED\"
|
2019-05-28 17:44:30 +02:00
|
|
|
|
2020-01-20 08:03:32 +01:00
|
|
|
[mergetool "meld"]
|
|
|
|
cmd = meld "$LOCAL" "$BASE" "$REMOTE" -o "$MERGED"
|
|
|
|
|
2019-05-28 17:44:30 +02:00
|
|
|
[pretty]
|
|
|
|
log = format:%h %s%d [%cn] (%ad)
|
|
|
|
log-color = format:%C(cyan)%h \
|
|
|
|
%Creset%s%C(white)%d %C(yellow)[%an] %Cred(%ad)
|
|
|
|
|
|
|
|
[grep]
|
|
|
|
lineNumber = true
|
|
|
|
patternType = perl
|
|
|
|
fallbackToNoIndex = true
|
|
|
|
|
|
|
|
[alias]
|
|
|
|
last = log -1 HEAD
|
|
|
|
hist = log --date=short --graph --pretty=log
|
|
|
|
ls = log --date=short --graph --pretty=log-color --decorate
|
|
|
|
ll = log --date=short --graph --pretty=log-color --decorate --numstat
|
|
|
|
amend = commit --amend -uno -a
|
2019-06-19 20:43:45 +02:00
|
|
|
wdiff = diff --word-diff
|
|
|
|
cdiff = diff --word-diff-regex=. --color-words
|
|
|
|
conflicts = diff --name-only --diff-filter=U
|
2019-07-03 18:19:12 +02:00
|
|
|
root = rev-parse --show-toplevel
|
2019-06-19 20:43:45 +02:00
|
|
|
shallow = clone --single-branch --depth=1
|
2019-05-28 17:44:30 +02:00
|
|
|
repush = !git commit --amend -a --no-edit && git push --force
|
2020-03-17 18:24:08 +01:00
|
|
|
fork-sync = "! \
|
2020-07-15 17:51:59 +02:00
|
|
|
git fetch --verbose ${1:-upstream} && git checkout --progress master && \
|
|
|
|
git reset --hard ${1:-upstream}/master && git push --verbose --force"
|
2019-05-28 17:44:30 +02:00
|
|
|
force-pull = "!git fetch -a && git reset --hard ${2:-origin}/${1:-master}"
|
|
|
|
|
2020-07-15 17:51:59 +02:00
|
|
|
[url "ssh://git@github.com/"]
|
2019-05-28 17:44:30 +02:00
|
|
|
insteadOf = https://github.com/
|
|
|
|
insteadOf = http://github.com/
|
|
|
|
insteadOf = @gh:
|
|
|
|
|
2020-07-15 17:51:59 +02:00
|
|
|
[url "ssh://git@gitlab.com/"]
|
2019-05-28 17:44:30 +02:00
|
|
|
insteadOf = https://gitlab.com/
|
|
|
|
insteadOf = http://gitlab.com/
|
|
|
|
insteadOf = @gl:
|
|
|
|
|
2020-07-15 17:51:59 +02:00
|
|
|
[url "ssh://git@git.disroot.org/"]
|
|
|
|
insteadOf = https://git.disroot.org/
|
|
|
|
insteadOf = http://git.disroot.org/
|
|
|
|
insteadOf = @disroot:
|
|
|
|
|
2019-05-28 17:44:30 +02:00
|
|
|
[url "ssh://aur@aur.archlinux.org/"]
|
|
|
|
insteadOf = https://aur.achlinux.org/
|
|
|
|
insteadOf = http://aur.archlinux.org/
|
|
|
|
insteadOf = @aur:
|
|
|
|
|
|
|
|
[url "https://bitbucket.org/"]
|
|
|
|
insteadOf = http://bitbucket.org/
|
|
|
|
insteadOf = @bb:
|
|
|
|
|
2020-01-20 08:03:32 +01:00
|
|
|
# vim:noet:sw=4:ts=4:
|