-
Notifications
You must be signed in to change notification settings - Fork 1
/
.gitconfig.local
46 lines (35 loc) · 1.39 KB
/
.gitconfig.local
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
[core]
; pager = delta --light
; pager = delta
; pager = diff-so-fancy | less --tabs=4 -RFX
pager = ~/.dotfiles/helpers/diff
[interactive]
diffFilter = ~/.dotfiles/helpers/diff
[delta]
features = unobtrusive-line-numbers decorations
whitespace-error-style = 22 reverse
; syntax-theme = Github
; side-by-side = true
[difftool "webstorm"]
cmd = /Applications/WebStorm.app/Contents/MacOS/webstorm diff $(cd $(dirname \"$LOCAL\") && pwd)/$(basename \"$LOCAL\") $(cd $(dirname \"$REMOTE\") && pwd)/$(basename \"$REMOTE\")
trustExitCode = true
[difftool "diff-so-fancy"]
cmd = diff-so-fancy
[mergetool "webstorm"]
cmd = /Applications/WebStorm.app/Contents/MacOS/webstorm 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 = true
[mergetool "vimdiff"]
cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustExitCode = true
[merge]
tool = webstorm
keepBackup = false
[diff]
tool = webstorm
colorMoved = default
[pull]
rebase = true