{"thread":{"id":"24425","subject":"[PATCH] Documentation: Explain git-mergetool's use of temporary files","startedAt":"2010-07-18T01:46:48Z","lastAt":"2010-07-24T16:30:30Z","messageCount":2,"participants":["David Aguilar","Chris.Cheney"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"145740","messageId":"1279417608-6442-1-git-send-email-davvid@gmail.com","threadId":"24425","inReplyTo":null,"subject":"[PATCH] Documentation: Explain git-mergetool's use of temporary files","fromName":"David Aguilar","fromEmail":"davvid@gmail.com","sentAt":"2010-07-18T01:46:48Z","receivedAt":"2010-07-18T01:46:48Z","isPatch":true,"sender":{"key":"davvid@gmail.com","avatar":"https://avatars.githubusercontent.com/u/13196?v=4"},"body":"'git mergetool' creates '*.orig' backup files in its\ndefault configuration.  Mention this in its documentation.\n\nSigned-off-by: David Aguilar <davvid@gmail.com>\n---\n Documentation/git-mergetool.txt |   10 ++++++++++\n 1 files changed, 10 insertions(+), 0 deletions(-)\n\ndiff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt\nindex 55735fa..e4ed016 100644\n--- a/Documentation/git-mergetool.txt\n+++ b/Documentation/git-mergetool.txt\n@@ -72,6 +72,16 @@ success of the resolution after the custom tool has exited.\n \tThis is the default behaviour; the option is provided to\n \toverride any configuration settings.\n \n+TEMPORARY FILES\n+---------------\n+`git mergetool` creates `*.orig` backup files while resolving merges.\n+These are safe to remove once a file has been merged and its\n+`git mergetool` session has completed.\n+\n+Setting the `mergetool.keepBackup` configuration variable to `false`\n+causes `git mergetool` to automatically remove the backup as files\n+are successfully merged.\n+\n Author\n ------\n Written by Theodore Y Ts'o <tytso@mit.edu>\n-- \n1.7.2.rc2.10.g637ab\n"},{"id":"146198","messageId":"Xns9DBFB2486416AChrisCheneytesconet@80.91.229.10","threadId":"24425","inReplyTo":"1279417608-6442-1-git-send-email-davvid@gmail.com","subject":"Re: [PATCH] Documentation: Explain git-mergetool's use of temporary files","fromName":"Chris.Cheney","fromEmail":"chris.cheney.nospam@tesco.net","sentAt":"2010-07-24T16:30:30Z","receivedAt":"2010-07-24T16:30:30Z","isPatch":true,"sender":{"key":"chris.cheney.nospam@tesco.net","avatar":null},"body":"David Aguilar <davvid@gmail.com> wrote in\nnews:1279417608-6442-1-git-send-email-davvid@gmail.com: \n\n> 'git mergetool' creates '*.orig' backup files in its\n> default configuration.  Mention this in its documentation.\n<snip>\n\nThanks\n"}]}