diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-01-06 12:42:48 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-06 12:42:48 -0800 |
| commit | 21c6a18c75cb48aaedffa6c95d6ff0076ffc6e1e (patch) | |
| tree | a4b6a354c97fba5f83ad45d1c5e9b90f68d62dd9 /Documentation/config.txt | |
| parent | 247f9d23da8cfd255533433ad2aa07d172afac0b (diff) | |
| parent | 5f4d133fca7eb3cb750f056a6fd0281ba06cd12f (diff) | |
| download | git-21c6a18c75cb48aaedffa6c95d6ff0076ffc6e1e.tar.gz git-21c6a18c75cb48aaedffa6c95d6ff0076ffc6e1e.tar.xz | |
Sync with 1.7.8.3
Diffstat (limited to 'Documentation/config.txt')
| -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 6e63b5938..27c768900 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1772,10 +1772,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 |