-
Notifications
You must be signed in to change notification settings - Fork 2
/
gitconfig.symlink
41 lines (36 loc) · 923 Bytes
/
gitconfig.symlink
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
[user]
name = Shane Liesegang
email = shane@techie.net
[init]
defaultBranch = main
[core]
editor = sublime-wait
excludesfile = ~/.gitignore_global
[push]
default = simple
[pull]
rebase = false
## handy to always be working off SSH access,
## but this was causing more problems than it solved
# [url "git@github.com:"]
# insteadOf = https://github.com/
[filter "lfs"]
required = true
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
[mergetool "Kaleidoscope"]
trustexitcode = true
[mergetool]
prompt = false
[merge]
tool = Kaleidoscope
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[difftool]
prompt = false
[diff]
tool = Kaleidoscope
renameLimit = 2000