Skip to content

Instantly share code, notes, and snippets.

@iiic
Last active November 25, 2019 15:42
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 iiic/dae8e77c21e0eb4f6ea9ac92bece8eba to your computer and use it in GitHub Desktop.
Save iiic/dae8e77c21e0eb4f6ea9ac92bece8eba to your computer and use it in GitHub Desktop.
můj gitconfig s nastavením mergetool a difftool pro vscode
[user]
email = ic.czech@gmail.com
name = Michal Lupečka
username = ic
[merge]
tool = vscode
[mergetool "vscode"]
cmd = code --wait $MERGED
[diff]
tool = vscode
[difftool "vscode"]
cmd = code --wait --diff $LOCAL $REMOTE
[core]
editor = code --wait
autocrlf = false
eol = lf
[color]
ui = auto
[ui]
# Nastaveni asi pouze pro Mercurial, ale jinde snad neuskodi
username = ic <ic.czech@gmail.com>
@iiic
Copy link
Author

iiic commented Nov 25, 2019

lokace ve Windows: C:\Users<username>.gitconfig

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment