bib2html.py: Add incollection bibtype

[shutils.git] / dotfiles / gitconfig

diff --git a/dotfiles/gitconfig b/dotfiles/gitconfig
index d31aa9e6ee118f00da5990e5cba7acf9775b7954..3ee134e3d38fad24cc379a59270310e7e7a77a8f 100644 (file)
--- a/dotfiles/gitconfig
+++ b/dotfiles/gitconfig
@@ -1,19 +1,62 @@
 [user]
-       name = Stefan Huber
-       email = me@example.com
-       signingkey = 0123456
+    name = Stefan Huber
+    email = me@example.com
+    signingkey = 0123456
+# [sendemail]
+#     smtpencryption = tls
+#     smtpserver = xxx
+#     smtpuser = xxx
+#     smtppass = xxx
+#     smtpsslcertpath = /etc/ssl/certs/ca-certificates.crt
+#     from = xxx
+#     bcc = xxx
+#     suppresscc = author
+#     suppresscc = self
+#     chainreplyto = true
+[http]
+    #prxy = http://username:password@192.168.9.10:8080
 [color]
-       ui = auto
+    ui = auto
+    status = auto
+    branch = auto
+    diff = auto
+    interactive = auto
 [core]
-       editor = vim
-       pager = less -FXRS -x4
+    editor = vi
+    pager = less -FXRS -x4
+[init]
+    defaultBranch = main
+[push]
+    default = simple
+[pull]
+    rebase = true
+[status]
+    #submodulesummary = true ; reduces speed of 'git status'
+[alias]
+    wdiff = diff -w --word-diff-regex="[^[:space:]]"
+    wlog = log -w --word-diff-regex="[^[:space:]]"
+    wshow = show -w --word-diff-regex="[^[:space:]]"
+    fhsprofile = config user.email "xxx@fh-salzburg.ac.at"
+[log]
+    decorate
+[diff]
+    renames = true
+    submodule = log
+    tool = nvimdiff
+[difftool]
+    prompt = false
+[difftool "nvimdiff"]
+    cmd = "nvim -d \"$LOCAL\" \"$REMOTE\""
 [merge]
-       tool = splice
+    tool = nvimdiff
+[mergetool]
+    prompt = true
 [mergetool "splice"]
-       cmd = "gvim -f $BASE $LOCAL $REMOTE $MERGED -c 'SpliceInit'"
-       trustExitCode = true
+    cmd = "vi -f \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\" -c 'SpliceInit'"
+    trustExitCode = true
+[mergetool "nvimdiff"]
+    cmd = "nvim -d \"$LOCAL\" \"$REMOTE\" \"$MERGED\" -c 'wincmd w' -c 'wincmd J'"
 [alias]
-       wdiff = diff --color-words
-       wlog = log --color-words
-[diff]
-       renames = true
+    lab = "!lab"
+    lab-i = "!lab issue"
+    li = "!lab issue"