-
Notifications
You must be signed in to change notification settings - Fork 0
/
gitconfig
36 lines (36 loc) · 1005 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
34
35
36
[core]
excludesfile = /Users/danny/.gitignore_global
[mergetool "sourcetree"]
cmd = /Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true
[user]
name = Danny Gershman
email = danny.gershman@gmail.com
signingkey = 227DAD0E
[commit]
template = /Users/danny/.stCommitMsg
gpgsign = true
[merge]
tool = bc3
[mergetool]
bc3 = trustExitCode
prompt = false
bc3 = trustExitCode
[diff]
tool = bc3
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustexitcode = true
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[difftool]
prompt = false
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
[gpg]
program = /usr/local/MacGPG2/bin/gpg
[url "git@github.com:"]
insteadOf = https://radius314@github.com/
[gui]
warndetachedcommit = true