mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-19 11:48:53 +02:00
Code

Merge branch 'maint-1.7.7' into maint

Browse Source 
* maint-1.7.7:
  Documentation: rerere.enabled is the primary way to configure rerere
This commit is contained in:
Junio C Hamano 2012-01-06 12:35:12 -08:00
commit cfdfc5a3b2
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

@ -1737,10 +1737,10 @@ rerere.autoupdate::
rerere.enabled:: rerere.enabled::
Activate recording of resolved conflicts, so that identical Activate recording of resolved conflicts, so that identical
conflict hunks can be resolved automatically, should they conflict hunks can be resolved automatically, should they be
be encountered again. linkgit:git-rerere[1] command is by encountered again. By default, linkgit:git-rerere[1] is
default enabled if you create `rr-cache` directory under enabled if there is an `rr-cache` directory under the
`$GIT_DIR`, but can be disabled by setting this option to false. `$GIT_DIR`.
sendemail.identity:: sendemail.identity::
A configuration identity. When given, causes values in the A configuration identity. When given, causes values in the