aboutsummaryrefslogtreecommitdiff
path: root/git/config
diff options
context:
space:
mode:
Diffstat (limited to 'git/config')
-rw-r--r--git/config32
1 files changed, 32 insertions, 0 deletions
diff --git a/git/config b/git/config
new file mode 100644
index 0000000..778e580
--- /dev/null
+++ b/git/config
@@ -0,0 +1,32 @@
1[user]
2 email = ts@its1.de
3 name = Thomas Schmucker
4
5[includeIf "gitdir:~/**/up2parts-*/"]
6 path = ~/.config/git/config-up2parts
7
8[init]
9 defaultBranch = master
10
11[core]
12 pager = delta
13
14[interactive]
15 diffFilter = delta --color-only
16
17[delta]
18 light = false
19 navigate = true
20 side-by-side = true
21 line-numbers = true
22 tabs = 4
23
24[merge]
25 conflictstyle = diff3
26
27[diff]
28 colorMoved = default
29
30[alias]
31 lg = log --color --graph --pretty=format:'%C(magenta)%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --branches
32