bib2html.py: Add incollection bibtype
[shutils.git] / dotfiles / gitconfig
1 [user]
2 name = Stefan Huber
3 email = me@example.com
4 signingkey = 0123456
5 [http]
6 #prxy = http://username:password@192.168.9.10:8080
7 [color]
8 ui = auto
9 status = auto
10 branch = auto
11 diff = auto
12 interactive = auto
13 [core]
14 editor = vi
15 pager = less -FXRS -x4
16 [init]
17 defaultBranch = main
18 [push]
19 default = simple
20 [pull]
21 rebase = true
22 [status]
23 #submodulesummary = true ; reduces speed of 'git status'
24 [alias]
25 wdiff = diff -w --word-diff-regex="[^[:space:]]"
26 wlog = log -w --word-diff-regex="[^[:space:]]"
27 wshow = show -w --word-diff-regex="[^[:space:]]"
28 [log]
29 decorate
30 [diff]
31 renames = true
32 submodule = log
33 tool = nvimdiff
34 [difftool]
35 prompt = false
36 [difftool "nvimdiff"]
37 cmd = "nvim -d \"$LOCAL\" \"$REMOTE\""
38 [merge]
39 tool = nvimdiff
40 [mergetool]
41 prompt = true
42 [mergetool "splice"]
43 cmd = "vi -f \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\" -c 'SpliceInit'"
44 trustExitCode = true
45 [mergetool "nvimdiff"]
46 cmd = "nvim -d \"$LOCAL\" \"$REMOTE\" \"$MERGED\" -c 'wincmd w' -c 'wincmd J'"