Avoid orphaned .orig files after resolving conflicts from a Git merge

Question

After I perform a Git merge and resolve the conflicts, there are leftover .orig versions of the conflicting files. How can I automatically delete those after the conflict is successfully resolved?

question from:https://stackoverflow.com/questions/7711727/avoid-orphaned-orig-files-after-resolving-conflicts-from-a-git-merge

Answer 1

It's the git mergetool that produces these files, you can disable them with this command:

git config --global mergetool.keepBackup false

See the git-config manpage:

http://man.he.net/man1/git-config