diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-01-10 14:24:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-10 14:24:01 -0800 |
| commit | 55dcc2ebad1b3ed4a6912f6f401f63cd3c71026f (patch) | |
| tree | d24d751dfcb1181c72ea034f498d8fad5fd613ad /Documentation/config.txt | |
| parent | 829a1c616967176ccd859c18a6e8ca0dda77f75a (diff) | |
| parent | 804e97fc77b3398db5461fdd79f2f96f6acf467d (diff) | |
| download | git-55dcc2ebad1b3ed4a6912f6f401f63cd3c71026f.tar.gz git-55dcc2ebad1b3ed4a6912f6f401f63cd3c71026f.tar.xz | |
Merge the attributes fix in from maint-1.6.7 branch
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 295939094..9fba453f2 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1740,7 +1740,8 @@ rerere.enabled:: conflict hunks can be resolved automatically, should they be encountered again. By default, linkgit:git-rerere[1] is enabled if there is an `rr-cache` directory under the - `$GIT_DIR`. + `$GIT_DIR`, e.g. if "rerere" was previously used in the + repository. sendemail.identity:: A configuration identity. When given, causes values in the |