Merge branch 'master' into next

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 25bcb840f9d3a85bebb632585531c6d0782d6970..2d0ca9d8ed09cd247e87adbc7be17f25ead1a353 100644 (file)
--- 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.
 
@@ -586,7 +589,7 @@ git Diffs
 
 Discussion[[Discussion]]
 ------------------------
-include::../README[]
+include::README[]
 
 Authors
 -------