Skip to content

Commit b6fb7fe

Browse files
committed
Documentation: rerere's rr-cache auto-creation and rerere.enabled
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 <[email protected]>
1 parent c432ef9 commit b6fb7fe

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

Documentation/config.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1703,7 +1703,8 @@ rerere.enabled::
17031703
conflict hunks can be resolved automatically, should they be
17041704
encountered again. By default, linkgit:git-rerere[1] is
17051705
enabled if there is an `rr-cache` directory under the
1706-
`$GIT_DIR`.
1706+
`$GIT_DIR`, e.g. if "rerere" was previously used in the
1707+
repository.
17071708

17081709
sendemail.identity::
17091710
A configuration identity. When given, causes values in the

0 commit comments

Comments
 (0)