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 <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
David Aguilar committed
Jul 17, 2010 at 18:46 UTC
d1cc4621eda62222fbc929a7f65c89b6be678c2e
1 file changed
+10
Documentation/git-mergetool.txt
+10
@@ -72,6 +72,16 @@ success of the resolution after the custom tool has exited.
72
This is the default behaviour; the option is provided to
73
override any configuration settings.
74
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
+
85
Author
86
------
87
Written by Theodore Y Ts'o <tytso@mit.edu>