Skip to content

Instantly share code, notes, and snippets.

@Kimeiga

Kimeiga/config

Created June 21, 2018 16:47
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save Kimeiga/6b589dc2149108ed231f61bcc6b0b769 to your computer and use it in GitHub Desktop.
Save Kimeiga/6b589dc2149108ed231f61bcc6b0b769 to your computer and use it in GitHub Desktop.
Download ZIP
Kimeiga's .git/config
Raw
config
[core]
repositoryformatversion = 0
filemode = false
bare = false
logallrefupdates = true
symlinks = false
ignorecase = true
[merge]
tool = unityyamlmerge
[merge "unityyamlmerge"]
keepTemporaries = true
keepBackup = false
path = 'C:\\Program Files\\Unity\\Editor\\Data\\Tools\\UnityYAMLMerge.exe'
cmd = 'C:\\Program Files\\Unity\\Editor\\Data\\Tools\\UnityYAMLMerge.exe' merge -p $BASE $REMOTE $LOCAL $MERGED
trustExitCode = false
[diff "unity"]
textconv='C:\\Users\\Kimeiga\\unityYamlTextConv.py'
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment