Merge branch 'js/reverse'

[git.git] / Documentation / git-rerere.txt

diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt
index c65c59e8612691bf769a5c8fe62c73164bac812d..139b6eb7733aaf246af8ce77f6483fa15e5de2b0 100644 (file)
--- a/Documentation/git-rerere.txt
+++ b/Documentation/git-rerere.txt
@@ -3,7 +3,7 @@ git-rerere(1)
 
 NAME
 ----
-git-rerere - Reuse recorded resolve
+git-rerere - Reuse recorded resolution of conflicted merges
 
 SYNOPSIS
 --------