-
Notifications
You must be signed in to change notification settings - Fork 2
/
Copy pathconfig
35 lines (35 loc) · 910 Bytes
/
config
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
[core]
bare = false
filemode = false
symlinks = false
ignorecase = true
logallrefupdates = true
[core]
repositoryformatversion = 0
[user]
[user]
[diff]
tool = vsdiffmerge
[difftool]
prompt = true
[difftool "vsdiffmerge"]
cmd = \"C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\Common7\\IDE\\vsdiffmerge.exe\" \"$LOCAL\" \"$REMOTE\" //t
[difftool "vsdiffmerge"]
keepbackup = false
[merge]
tool = vsdiffmerge
[mergetool]
prompt = true
[mergetool "vsdiffmerge"]
cmd = \"C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\Common7\\IDE\\vsdiffmerge.exe\" \"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\" //m
trustexitcode = true
[mergetool "vsdiffmerge"]
keepbackup = false
[remote "origin"]
url = https://github.com/ninjakitteh69/Clickatell-Csharp
[remote "origin"]
fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
remote = origin
[branch "master"]
merge = refs/heads/master