diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-01-10 14:14:26 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-10 14:14:26 -0800 |
| commit | 6c65b5ea439165512d128e18829b67688ddab9cc (patch) | |
| tree | 610724b9cf742ca3a0745f16a9d3fa6f30f92a46 /Documentation/config.txt | |
| parent | 8769e93327f5efc26d179d794a67a5b993cd3693 (diff) | |
| parent | f14f9803ef13e972371e3f4bce69bca13dd1cd2d (diff) | |
| download | git-6c65b5ea439165512d128e18829b67688ddab9cc.tar.gz | |
Merge the attributes fix in from maint-1.6.6 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 bdd4cb83d3..3bcf660e02 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1711,7 +1711,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 |