diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-01-06 12:35:12 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-06 12:35:12 -0800 |
| commit | cfdfc5a3b2289dd54a25d7523c0cf4d3e6efd84b (patch) | |
| tree | 503da39e6dd48ce65ac8c19668c647f034fdf47e | |
| parent | 1327d83954bcf755094995b63317b23986c550f2 (diff) | |
| parent | 8769e93327f5efc26d179d794a67a5b993cd3693 (diff) | |
| download | git-cfdfc5a3b2289dd54a25d7523c0cf4d3e6efd84b.tar.gz git-cfdfc5a3b2289dd54a25d7523c0cf4d3e6efd84b.tar.xz | |
Merge branch 'maint-1.7.7' into maint
* maint-1.7.7:
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 f22d92677..295939094 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1737,10 +1737,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 |