* [PATCH] Documentation: Explain git-mergetool's use of temporary files
@ 2010-07-18 1:46 David Aguilar
2010-07-24 16:30 ` Chris.Cheney
0 siblings, 1 reply; 2+ messages in thread
From: David Aguilar @ 2010-07-18 1:46 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Charles Bailey, The Best VCS, Chris Cheney
'git mergetool' creates '*.orig' backup files in its
default configuration. Mention this in its documentation.
Signed-off-by: David Aguilar <davvid@gmail.com>
---
Documentation/git-mergetool.txt | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt
index 55735fa..e4ed016 100644
--- a/Documentation/git-mergetool.txt
+++ b/Documentation/git-mergetool.txt
@@ -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>
--
1.7.2.rc2.10.g637ab
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-07-24 16:30 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-18 1:46 [PATCH] Documentation: Explain git-mergetool's use of temporary files David Aguilar
2010-07-24 16:30 ` Chris.Cheney
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).