X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit.txt;h=2d0ca9d8ed09cd247e87adbc7be17f25ead1a353;hb=8389b52b2a51d5b110b508cc67f0f41f99c30d3f;hp=e8ef3efa89a69b3ef4a919a40b8fbd4dec690d0f;hpb=1cb303872ab1ba73fcc52167c61fc4211c843cf5;p=git.git

diff --git a/Documentation/git.txt b/Documentation/git.txt
index e8ef3efa..2d0ca9d8 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -313,6 +313,9 @@ gitlink:git-rebase[1]::
 gitlink:git-repack[1]::
 	Pack unpacked objects in a repository.
 
+gitlink:git-rerere[1]::
+	Reuse recorded resolution of conflicted merges.
+
 gitlink:git-reset[1]::
 	Reset current HEAD to the specified state.