Skip to content

Commit

Permalink
Documentation: rerere's rr-cache auto-creation and rerere.enabled
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Junio C Hamano committed Jan 10, 2012
1 parent c432ef9 commit b6fb7fe
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion Documentation/config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1703,7 +1703,8 @@ rerere.enabled::
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`.
`$GIT_DIR`, e.g. if "rerere" was previously used in the
repository.

sendemail.identity::
A configuration identity. When given, causes values in the
Expand Down

0 comments on commit b6fb7fe

Please sign in to comment.