Merge branch 'nd/switch-and-restore'

diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt
index fe4434ad9df93eb0a9a60c1fb0128949b29ec9ab..4cfc883378082673e57c4d14fc27764e6223c0c4 100644 (file)
--- a/Documentation/git-rerere.txt
+++ b/Documentation/git-rerere.txt
@@ -24,7 +24,7 @@ on the initial manual merge, and applying previously recorded
 hand resolutions to their corresponding automerge results.
 
 [NOTE]
-You need to set the configuration variable rerere.enabled in order to
+You need to set the configuration variable `rerere.enabled` in order to
 enable this command.