summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-07-19 18:21:08 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-07-19 18:21:08 (GMT)
commitc5212b87dafb3f559ceb898bd9b40bfc3cd0ad68 (patch)
treeef8e9686d647a7e47a6c999cfbca6d0e14bcb1c4
parentf0e5a4b7f3db2d4e1ded9683817d1d1d3a2a220f (diff)
parentc173dad58787a7f11a526dbcdaa5a2fe9ff1c87f (diff)
downloadgit-c5212b87dafb3f559ceb898bd9b40bfc3cd0ad68.zip
git-c5212b87dafb3f559ceb898bd9b40bfc3cd0ad68.tar.gz
git-c5212b87dafb3f559ceb898bd9b40bfc3cd0ad68.tar.bz2
Merge branch 'maint'
* maint: update-server-info: Shorten read_pack_info_file() Documentation: Explain git-mergetool's use of temporary files
-rw-r--r--Documentation/git-mergetool.txt10
-rw-r--r--server-info.c3
2 files changed, 10 insertions, 3 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>
diff --git a/server-info.c b/server-info.c
index 4098ca2..9ec744e 100644
--- a/server-info.c
+++ b/server-info.c
@@ -113,11 +113,8 @@ static int read_pack_info_file(const char *infofile)
goto out_stale;
break;
case 'D': /* we used to emit D but that was misguided. */
- goto out_stale;
- break;
case 'T': /* we used to emit T but nobody uses it. */
goto out_stale;
- break;
default:
error("unrecognized: %s", line);
break;