-
Notifications
You must be signed in to change notification settings - Fork 1
/
gitconfig.mac
59 lines (51 loc) · 1.77 KB
/
gitconfig.mac
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
# vim: set filetype=dosini:
[user]
name = Craig P. Motlin
email = [email protected]
[core]
autocrlf = input
[maintenance]
repo = ~/.dotfiles
repo = ~/projects/eclipse-collections
repo = ~/projects/klass
# repo = ~/projects/klass-rewrite
repo = ~/projects/liftwizard
# https://gist.github.com/ffittschen/6d9be1720f30eb8dc0142cc0ed91c7d9
# https://www.jetbrains.com/help/idea/tutorial-use-idea-as-default-command-line-merge-tool.html
[alias]
m = mergetool --tool=intellij
[merge]
tool = intellij
[mergetool "intellij"]
cmd = ~/bin/idea merge $(cd $(dirname \"$LOCAL\") && pwd)/$(basename \"$LOCAL\") $(cd $(dirname \"$REMOTE\") && pwd)/$(basename \"$REMOTE\") $(cd $(dirname \"$BASE\") && pwd)/$(basename \"$BASE\") $(cd $(dirname \"$MERGED\") && pwd)/$(basename \"$MERGED\")
trustExitCode = false
# diff-so-fancy or delta
# https://github.com/dandavison/delta
[core]
pager = delta --features default-feature "$(defaults read -globalDomain AppleInterfaceStyle &> /dev/null && echo dark-mode || echo light-mode)"
[interactive]
diffFilter = delta --color-only --features default-feature "$(defaults read -globalDomain AppleInterfaceStyle &> /dev/null && echo dark-mode || echo light-mode)"
[delta "default-feature"]
# use n and N to move between diff sections
navigate = true
# delta detects terminal colors automatically; set one of these to disable auto-detection
# dark = true
# light = true
true-color = always
tabs = 4
line-numbers = false
[delta "light-mode"]
light = true
features = hoopoe
[delta "dark-mode"]
light = false
features = colibri
# features = calochortus-lyallii
# features = github
# features = chameleon
# features = arctic-fox
# features = calochortus-lyallii
[diff]
colorMoved = default
[include]
path = ~/projects/open-source/delta/themes.gitconfig