Merge branch 'jc/empty' into next

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 875d4877667d8d7cc92eca7af319a29e029221d1..8610d36c4927fe198604189e68b131cc58be7f4d 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -20,15 +20,16 @@ brings your stuff to the plumbing).
 OPTIONS
 -------
 --version::
-       prints the git suite version that the 'git' program came from.
+       Prints the git suite version that the 'git' program came from.
 
 --help::
-       prints the synopsis and a list of available commands.
-       If a git command is named this option will bring up the
-       man-page for that command.
+       Prints the synopsis and a list of the most commonly used
+       commands.  If a git command is named this option will bring up
+       the man-page for that command. If the option '--all' or '-a' is
+       given then all available commands are printed.
 
 --exec-path::
-       path to wherever your core git programs are installed.
+       Path to wherever your core git programs are installed.
        This can also be controlled by setting the GIT_EXEC_PATH
        environment variable. If no path is given 'git' will print
        the current setting and then exit.
@@ -43,12 +44,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
@@ -139,6 +141,9 @@ Interrogation commands
 gitlink:git-cat-file[1]::
        Provide content or type/size information for repository objects.
 
+gitlink:git-describe[1]::
+       Show the most recent tag that is reachable from a commit.
+
 gitlink:git-diff-index[1]::
        Compares content and mode of blobs between the index and repository.
 
@@ -309,6 +314,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.
 
@@ -582,7 +590,7 @@ git Diffs
 
 Discussion[[Discussion]]
 ------------------------
-include::../README[]
+include::README[]
 
 Authors
 -------