undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Documentation: rerere's rr-cache auto-creation and rerere.enabled

Browse Source 
The description of rerere.enabled left the user in the dark as to who
might create an rr-cache directory.  Add a note that simply invoking
rerere does this.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2012-01-10 15:57:27 +01:00
parent c432ef996e
commit b6fb7fed6a
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/config.txt
View File

@ -1703,7 +1703,8 @@ rerere.enabled::
conflict hunks can be resolved automatically, should they be conflict hunks can be resolved automatically, should they be
encountered again. By default, linkgit:git-rerere[1] is encountered again. By default, linkgit:git-rerere[1] is
enabled if there is an `rr-cache` directory under the enabled if there is an `rr-cache` directory under the
`$GIT_DIR`. `$GIT_DIR`, e.g. if "rerere" was previously used in the
repository.
sendemail.identity:: sendemail.identity::
A configuration identity. When given, causes values in the A configuration identity. When given, causes values in the