-
Notifications
You must be signed in to change notification settings - Fork 0
/
gitconfig
33 lines (33 loc) · 849 Bytes
/
gitconfig
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
[user]
name = Bob Martens
email = bob@bobmartens.net
[filter "media"]
required = true
clean = git media clean %f
smudge = git media smudge %f
[push]
# Push current branch even if you've never pushed it before
default = current
[github]
user = boblmartens
token = 579c652d9ae7b426279d3d920a26795e
[core]
excludesfile = /Users/bob/.gitignore
editor = mate -w
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustexitcode = true
[merge]
tool = Kaleidoscope
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[difftool]
prompt = false
[mergetool]
prompt = false
[diff]
tool = Kaleidoscope
[filter "hawser"]
clean = git hawser clean %f
smudge = git hawser smudge %f
required = true