Merge branch 'master' of git://ozlabs.org/~paulus/gitk

diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt
index a62227f84e88a5fae13af18e66aec6452693d354..9ee083c415a27dc499b75031d49df9e3f3856ec0 100644 (file)
--- a/Documentation/git-rerere.txt
+++ b/Documentation/git-rerere.txt
@@ -69,7 +69,7 @@ Prune records of conflicted merges that
 occurred a long time ago.  By default, unresolved conflicts older
 than 15 days and resolved conflicts older than 60
 days are pruned.  These defaults are controlled via the
-`gc.rerereunresolved` and `gc.rerereresolved` configuration
+`gc.rerereUnresolved` and `gc.rerereResolved` configuration
 variables respectively.