Skip to content

Instantly share code, notes, and snippets.

@PSyton
Created June 28, 2013 04:15
Show Gist options
  • Select an option

  • Save PSyton/5882418 to your computer and use it in GitHub Desktop.

Select an option

Save PSyton/5882418 to your computer and use it in GitHub Desktop.
Настройка git на чистой Win системе
Добавить пути для p4merge.exe и sublime_text.exe в Path.
git config --global merge.tool p4merge
git config --global mergetool.p4merge.cmd "p4merge.exe \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\""
git config --global core.editor "sublime_text.exe -w -n"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment