Skip to content

Commit

Permalink
Documentation: Explain git-mergetool's use of temporary files
Browse files Browse the repository at this point in the history
'git mergetool' creates '*.orig' backup files in its
default configuration.  Mention this in its documentation.

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
davvid authored and gitster committed Jul 19, 2010
1 parent 0ad0a61 commit d1cc462
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions Documentation/git-mergetool.txt
Expand Up @@ -72,6 +72,16 @@ success of the resolution after the custom tool has exited.
This is the default behaviour; the option is provided to
override any configuration settings.

TEMPORARY FILES
---------------
`git mergetool` creates `*.orig` backup files while resolving merges.
These are safe to remove once a file has been merged and its
`git mergetool` session has completed.

Setting the `mergetool.keepBackup` configuration variable to `false`
causes `git mergetool` to automatically remove the backup as files
are successfully merged.

Author
------
Written by Theodore Y Ts'o <tytso@mit.edu>
Expand Down

0 comments on commit d1cc462

Please sign in to comment.