Skip to content

Instantly share code, notes, and snippets.

@krypty

krypty/gitconfig

Last active April 20, 2016 16:15
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save krypty/4a4c61c34e87d073db95 to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save krypty/4a4c61c34e87d073db95 to your computer and use it in GitHub Desktop.
Download ZIP
gitconfig
Raw
gitconfig
# meld a mettre dans le path
[diff]
tool = meld
keepBackup = false
prompt = false
[merge]
tool = meld
keepBackup = false
prompt = false
[mergetool "kdiff3"]
path = C:/Program Files/KDiff3/kdiff3.exe
trustExitCode = false
[mergetool "meld"]
cmd = meld.exe \"$BASE\" \"$LOCAL\" \"$REMOTE\" \\\"$MERGED\"
[difftool "meld"]
cmd = meld.exe \"$LOCAL\" \"$REMOTE\"
@krypty
Copy link
Author

krypty commented Apr 20, 2016

no more used...

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