aboutsummaryrefslogtreecommitdiff
path: root/tw/home/files/gitconfig
diff options
context:
space:
mode:
Diffstat (limited to 'tw/home/files/gitconfig')
-rw-r--r--tw/home/files/gitconfig43
1 files changed, 43 insertions, 0 deletions
diff --git a/tw/home/files/gitconfig b/tw/home/files/gitconfig
new file mode 100644
index 00000000..1f6c49f1
--- /dev/null
+++ b/tw/home/files/gitconfig
@@ -0,0 +1,43 @@
+# This is Git's per-user configuration file.
+[user]
+ name = Timo Wilken
+ email = timo.21.wilken@gmail.com
+ signingkey = 53EC3C06856883DD92355BC22FC78504681F69B0
+[commit]
+ gpgsign = true
+[url "https://"]
+ insteadOf = git://
+[url "ssh://git@gitlab.cern.ch:7999/"]
+ insteadOf = https://gitlab.cern.ch/
+[url "ssh://git@ssh.github.com/"]
+ insteadOf = gh:
+[gui]
+ fontui = -family \"Fira Sans\" -size 10 -weight normal -slant roman -underline 0 -overstrike 0
+ fontdiff = -family \"Hermit\" -size 10 -weight normal -slant roman -underline 0 -overstrike 0
+ tabsize = 4
+[merge]
+ summary = true
+ conflictstyle = diff3
+[color]
+ ui = auto
+[pull]
+ rebase = false
+ ff = only
+[alias]
+ glog = log --decorate --graph --all --oneline
+ plog = log --decorate --graph --all --oneline --pretty=tformat:\"%C(yellow)%h %Cgreen%as %Cblue%<(10,trunc)%an%Cred%d%Creset %s\"
+[init]
+ defaultBranch = master
+[advice]
+ detachedHead = false
+# https://sw.kovidgoyal.net/kitty/kittens/diff/
+[diff]
+ tool = kitty
+ guitool = kitty.gui
+[difftool]
+ prompt = false
+ trustExitCode = true
+[difftool "kitty"]
+ cmd = kitty +kitten diff $LOCAL $REMOTE
+[difftool "kitty.gui"]
+ cmd = kitty kitty +kitten diff $LOCAL $REMOTE \ No newline at end of file