# 默认冲突解决、Rebase编辑器
[core]
editor = \"D:\\Program Files (x86)\\Microsoft VS Code\\Code.exe\" --wait
[user]
name = *********
email = **********
[credential]
helper = manager
[merge "ours"]
driver = ture
[difftool]
prompt = true
[mergetool]
prompt = false
keepBackup = false
[merge]
tool = tortoisemerge
[mergetool "tortoisemerge"]
path = D:\\Program Files\\TortoiseGit\\bin\\TortoiseGitMerge.exe
[diff]
tool = vsdiffmerge
[difftool "tortoisediff"]
cmd = TortoiseGitMerge $LOCAL $REMOTE
path = D:\\Program Files\\TortoiseGit\\bin\\TortoiseGitMerge.exe
[i18n]
# log编码
logoutputencoding = utf-8
解决git status不能显示中文的问题
git config --global core.quotepath false