summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Aguilar <davvid@gmail.com>2010-07-18 01:46:48 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-07-19 16:16:09 (GMT)
commitd1cc4621eda62222fbc929a7f65c89b6be678c2e (patch)
tree59bb12689639adc5d3b15b0c12ad39dd0d3ad7d7
parent0ad0a61f05fe521a63ade9bfafd2f589fba0df33 (diff)
downloadgit-d1cc4621eda62222fbc929a7f65c89b6be678c2e.zip
git-d1cc4621eda62222fbc929a7f65c89b6be678c2e.tar.gz
git-d1cc4621eda62222fbc929a7f65c89b6be678c2e.tar.bz2
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>
-rw-r--r--Documentation/git-mergetool.txt10
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>