AdrienVR/.gitconfig

Last active September 29, 2017 13:20

Star () You must be signed in to star a gist
Fork () You must be signed in to fork a gist

Learn more about clone URLs
Clone this repository at <script src="https://gist.github.com/AdrienVR/ea19811951f796b3b042b24f8655d01f.js"></script>
Save AdrienVR/ea19811951f796b3b042b24f8655d01f to your computer and use it in GitHub Desktop.

Download ZIP

Git mergetool generates unwanted .orig files on conflicts

Raw

git config --global mergetool.keepBackup false

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