2014-04-14 12:06:53 +04:00
|
|
|
[alias]
|
|
|
|
c = commit
|
|
|
|
co = checkout
|
|
|
|
dt = difftool
|
|
|
|
mt = mergetool
|
|
|
|
praise = blame
|
|
|
|
ff = merge --ff-only
|
|
|
|
st = status
|
|
|
|
sync = !git pull && git push
|
|
|
|
|
|
|
|
[apply]
|
|
|
|
whitespace = nowarn
|
|
|
|
|
2008-02-12 13:09:32 +03:00
|
|
|
[core]
|
|
|
|
symlinks = false
|
2012-02-23 03:54:47 +04:00
|
|
|
autocrlf = true
|
2012-01-30 23:48:47 +04:00
|
|
|
editor = gitpad
|
2014-04-14 11:50:37 +04:00
|
|
|
preloadindex = true
|
|
|
|
fscache = true
|
2012-01-30 23:45:45 +04:00
|
|
|
|
2008-02-12 13:09:32 +03:00
|
|
|
[color]
|
|
|
|
diff = auto
|
2010-12-20 22:49:44 +03:00
|
|
|
status = auto
|
|
|
|
branch = auto
|
|
|
|
interactive = true
|
2012-01-30 23:45:45 +04:00
|
|
|
ui = true
|
|
|
|
|
2008-02-12 13:09:32 +03:00
|
|
|
[pack]
|
|
|
|
packSizeLimit = 2g
|
2012-01-30 23:45:45 +04:00
|
|
|
|
2008-07-03 15:41:40 +04:00
|
|
|
[help]
|
|
|
|
format = html
|
2012-01-30 23:45:45 +04:00
|
|
|
|
2009-07-26 05:43:53 +04:00
|
|
|
[http]
|
|
|
|
sslCAinfo = /mingw/bin/curl-ca-bundle.crt
|
2012-01-30 23:45:45 +04:00
|
|
|
|
2009-07-29 20:29:24 +04:00
|
|
|
[sendemail]
|
|
|
|
smtpserver = /mingw/bin/msmtp.exe
|
2010-11-12 20:23:37 +03:00
|
|
|
|
|
|
|
[diff "astextplain"]
|
|
|
|
textconv = astextplain
|
2012-01-30 23:45:45 +04:00
|
|
|
|
2011-03-22 15:05:55 +03:00
|
|
|
[rebase]
|
|
|
|
autosquash = true
|
2012-01-28 04:35:53 +04:00
|
|
|
|
|
|
|
[credential]
|
|
|
|
helper = !github --credentials
|
2012-02-05 06:33:23 +04:00
|
|
|
|
|
|
|
[filter "ghcleansmudge"]
|
2012-02-06 05:04:47 +04:00
|
|
|
clean = cat
|
|
|
|
smudge = cat
|
2014-04-14 12:06:53 +04:00
|
|
|
|
2012-03-19 22:13:26 +04:00
|
|
|
[push]
|
|
|
|
default = upstream
|
2012-03-09 05:23:58 +04:00
|
|
|
|
|
|
|
[diff]
|
2014-04-17 23:43:28 +04:00
|
|
|
tool = vs2013
|
2014-04-14 12:06:53 +04:00
|
|
|
algorithm = histogram
|
|
|
|
|
2012-03-09 05:23:58 +04:00
|
|
|
[difftool]
|
|
|
|
prompt = false
|
|
|
|
[difftool "bc4"]
|
|
|
|
cmd = \"c:/program files (x86)/beyond compare 3/bcomp.exe\" \"$LOCAL\" \"$REMOTE\"
|
|
|
|
[difftool "p4"]
|
|
|
|
cmd = \"c:/program files/Perforce/p4merge.exe\" \"$LOCAL\" \"$REMOTE\"
|
2014-04-17 23:43:28 +04:00
|
|
|
[difftool "vs2012"]
|
2012-03-09 05:23:58 +04:00
|
|
|
cmd = \"c:/program files (x86)/microsoft visual studio 11.0/common7/ide/devenv.exe\" '//diff' \"$LOCAL\" \"$REMOTE\"
|
2014-04-17 23:43:28 +04:00
|
|
|
[difftool "vs2013"]
|
2014-04-14 12:06:53 +04:00
|
|
|
cmd = \"c:/program files (x86)/microsoft visual studio 12.0/common7/ide/devenv.exe\" '//diff' \"$LOCAL\" \"$REMOTE\"
|
2012-03-09 05:23:58 +04:00
|
|
|
|
|
|
|
[merge]
|
|
|
|
tool = bc3
|
|
|
|
[mergetool]
|
|
|
|
prompt = false
|
|
|
|
keepBackup = false
|
|
|
|
[mergetool "bc3"]
|
|
|
|
cmd = \"c:/program files (x86)/beyond compare 3/bcomp.exe\" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"
|
|
|
|
trustExitCode = true
|
|
|
|
[mergetool "p4"]
|
|
|
|
cmd = \"c:/program files/Perforce/p4merge.exe\" \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
|
|
|
|
trustExitCode = false
|