[user] email = chronobserver@disroot.org name = ObserverOfTime signingkey = 8A2DEA1DBAEBCA9E [core] editor = ${EDITOR:-nvim} pager = ${PAGER:-nvimpager} whitespace = tabwidth=4,cr-at-eol [credential] helper = store [gpg] program = gpg2 [commit] gpgSign = true status = true [status] submoduleSummary = 1 [color "diff"] meta = yellow [diff] algorithm = patience wsErrorHighlight = all mnemonicPrefix = true [diff "hex"] textconv = hexdump -v -C [diff "pdf"] textconv = pdfinfo [difftool] prompt = false [difftool "meld"] cmd = meld "$REMOTE" "$LOCAL" [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 [mergetool] keepBackup = false [mergetool "fugitive"] cmd = nvim -f -c \"Gvdiffsplit!\" \"$MERGED\" [mergetool "meld"] cmd = meld "$LOCAL" "$BASE" "$REMOTE" -o "$MERGED" [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 wdiff = diff --word-diff cdiff = diff --word-diff-regex=. --color-words conflicts = diff --name-only --diff-filter=U root = rev-parse --show-toplevel shallow = clone --single-branch --depth=1 repush = !git commit --amend -a --no-edit && git push --force fork-sync = "! \ git fetch --verbose upstream && git checkout --progress master && \ git reset --hard upstream/master && git push --verbose --force" force-pull = "!git fetch -a && git reset --hard ${2:-origin}/${1:-master}" [url "git@github.com:"] insteadOf = https://github.com/ insteadOf = http://github.com/ insteadOf = @gh: [url "git@gitlab.com:"] insteadOf = https://gitlab.com/ insteadOf = http://gitlab.com/ insteadOf = @gl: [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: [filter "lfs"] clean = git-lfs clean -- %f smudge = git-lfs smudge -- %f process = git-lfs filter-process required = true # vim:noet:sw=4:ts=4: