mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-02 02:26:11 +02:00
Code

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
This commit is contained in:
Junio C Hamano 2012-01-06 12:35:05 -08:00
parent c07aa5b218 07b88a00c0
commit 8769e93327
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Documentation/config.txt
View File

@ -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