diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-07-19 11:21:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-19 11:21:08 -0700 |
| commit | c5212b87dafb3f559ceb898bd9b40bfc3cd0ad68 (patch) | |
| tree | ef8e9686d647a7e47a6c999cfbca6d0e14bcb1c4 | |
| parent | git add: Add --ignore-missing to SYNOPSIS (diff) | |
| parent | update-server-info: Shorten read_pack_info_file() (diff) | |
| download | tgif-c5212b87dafb3f559ceb898bd9b40bfc3cd0ad68.tar.xz | |
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.txt | 10 | ||||
| -rw-r--r-- | server-info.c | 3 |
2 files changed, 10 insertions, 3 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> diff --git a/server-info.c b/server-info.c index 4098ca2b5c..9ec744e9f2 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; |