diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-01-10 14:46:22 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-10 14:46:22 -0800 |
| commit | e04dc492ac1206c7a7e624c09344081263af0e66 (patch) | |
| tree | e8202b9e7c732c992eb34558a922b335a91a5d0c /Documentation/config.txt | |
| parent | beecc7ab65b31c5471331e64acaa3f722125ea67 (diff) | |
| parent | be4d2920c24ba0be84ceff7e382cce2c5f1ad867 (diff) | |
| download | git-e04dc492ac1206c7a7e624c09344081263af0e66.tar.gz git-e04dc492ac1206c7a7e624c09344081263af0e66.tar.xz | |
Sync with maint
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 04f5e19dc..abeb82b2c 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1786,7 +1786,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 |