1. Stefan Saasen
  2. git


David Aguilar  committed d1cc462

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>

  • Participants
  • Parent commits 0ad0a61
  • Branches master

Comments (0)

Files changed (1)

File Documentation/git-mergetool.txt

View file
 	This is the default behaviour; the option is provided to
 	override any configuration settings.
+`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.
 Written by Theodore Y Ts'o <tytso@mit.edu>