Skip to content

Commit d1cc462

Browse files
davvidgitster
authored andcommitted
Documentation: Explain git-mergetool's use of temporary files
'git mergetool' creates '*.orig' backup files in its default configuration. Mention this in its documentation. Signed-off-by: David Aguilar <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 0ad0a61 commit d1cc462

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

Documentation/git-mergetool.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,16 @@ success of the resolution after the custom tool has exited.
7272
This is the default behaviour; the option is provided to
7373
override any configuration settings.
7474

75+
TEMPORARY FILES
76+
---------------
77+
`git mergetool` creates `*.orig` backup files while resolving merges.
78+
These are safe to remove once a file has been merged and its
79+
`git mergetool` session has completed.
80+
81+
Setting the `mergetool.keepBackup` configuration variable to `false`
82+
causes `git mergetool` to automatically remove the backup as files
83+
are successfully merged.
84+
7585
Author
7686
------
7787
Written by Theodore Y Ts'o <[email protected]>

0 commit comments

Comments
 (0)