diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-01-06 12:35:05 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-06 12:35:05 -0800 |
| commit | 8769e93327f5efc26d179d794a67a5b993cd3693 (patch) | |
| tree | 0f5cd5640dd8acd8dd6867fcb1d54d3cd0cb34f0 | |
| parent | c07aa5b218b9f519c29b5be71fe43cd79365dd37 (diff) | |
| parent | 07b88a00c0caac055a9f52167523248a75711842 (diff) | |
| download | git-8769e93327f5efc26d179d794a67a5b993cd3693.tar.gz git-8769e93327f5efc26d179d794a67a5b993cd3693.tar.xz | |
Merge branch 'maint-1.7.6' into maint-1.7.7
* maint-1.7.6:
Documentation: rerere.enabled is the primary way to configure rerere
| -rw-r--r-- | Documentation/config.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index eae75a39c..bdd4cb83d 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1708,10 +1708,10 @@ rerere.autoupdate:: rerere.enabled:: Activate recording of resolved conflicts, so that identical - conflict hunks can be resolved automatically, should they - be encountered again. linkgit:git-rerere[1] command is by - default enabled if you create `rr-cache` directory under - `$GIT_DIR`, but can be disabled by setting this option to false. + 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`. sendemail.identity:: A configuration identity. When given, causes values in the |