Merge branch 'lt/apply' into next

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 92cfe0ee31a3ce6fc85ac4041ae9bb17e6419a8d..2d0ca9d8ed09cd247e87adbc7be17f25ead1a353 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -43,12 +43,13 @@ people.  The <<Discussion>> section below contains much useful
 definition and clarification - read that first.
 
 If you are interested in using git to manage (version control)
-projects, use link:everyday.html[Everyday GIT] as a guide to the
+projects, use link:tutorial.html[The Tutorial] to get you started,
+and then link:everyday.html[Everyday GIT] as a guide to the
 minimum set of commands you need to know for day-to-day work.
 Most likely, that will get you started, and you can go a long
 way without knowing the low level details too much.
 
-The link:tutorial.html[tutorial] document covers how things
+The link:core-tutorial.html[Core tutorial] document covers how things
 internally work.
 
 If you are migrating from CVS, link:cvs-migration.html[cvs
@@ -312,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.
 
@@ -585,7 +589,7 @@ git Diffs
 
 Discussion[[Discussion]]
 ------------------------
-include::../README[]
+include::README[]
 
 Authors
 -------