diff options
| author |  David Aguilar <davvid@gmail.com> | 2010-07-17 18:46:48 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-07-19 09:16:09 -0700 |
| commit | d1cc4621eda62222fbc929a7f65c89b6be678c2e (patch) | |
| tree | 59bb12689639adc5d3b15b0c12ad39dd0d3ad7d7 /Documentation/git-mergetool.txt | |
| parent | Documentation: add submodule.* to the big configuration variable list (diff) | |
| download | tgif-d1cc4621eda62222fbc929a7f65c89b6be678c2e.tar.xz | |
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>
Diffstat (limited to 'Documentation/git-mergetool.txt')
| -rw-r--r-- | 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 55735faf7b..e4ed016146 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> |