Merge branch 'maint'

[git.git] / Documentation / user-manual.txt

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 08d1310bf5fc5590ada1ee5b2af77d361ff4d874..9f527d3b2e75df15d3114404f9590f2ba47f41ea 100644 (file)
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -18,12 +18,22 @@ People needing to do actual development will also want to read
 Further chapters cover more specialized topics.
 
 Comprehensive reference documentation is available through the man
 Further chapters cover more specialized topics.
 
 Comprehensive reference documentation is available through the man

-pages.  For a command such as "git clone <repo>", just use
+pages, or linkgit:git-help[1] command.  For example, for the command
+"git clone <repo>", you can either use:

 
 ------------------------------------------------
 $ man git-clone
 ------------------------------------------------
 
 
 ------------------------------------------------
 $ man git-clone
 ------------------------------------------------
 

+or:
+
+------------------------------------------------
+$ git help clone
+------------------------------------------------
+
+With the latter, you can use the manual viewer of your choice; see
+linkgit:git-help[1] for more information.
+

 See also <<git-quick-start>> for a brief overview of git commands,
 without any explanation.
 
 See also <<git-quick-start>> for a brief overview of git commands,
 without any explanation.
 


@@ -536,7 +546,7 @@ $ git bisect skip
 -------------------------------------------------
 
 In this case, though, git may not eventually be able to tell the first
 -------------------------------------------------
 
 In this case, though, git may not eventually be able to tell the first

-bad one between some first skipped commits and a latter bad commit.
+bad one between some first skipped commits and a later bad commit.

 
 There are also ways to automate the bisecting process if you have a
 test script that can tell a good from a bad commit. See
 
 There are also ways to automate the bisecting process if you have a
 test script that can tell a good from a bad commit. See


@@ -4356,7 +4366,9 @@ $ git remote show example # get details
 * remote example
   URL: git://example.com/project.git
   Tracked remote branches
 * remote example
   URL: git://example.com/project.git
   Tracked remote branches

-    master next ...
+    master
+    next
+    ...

 $ git fetch example            # update branches from example
 $ git branch -r                        # list all remote branches
 -----------------------------------------------
 $ git fetch example            # update branches from example
 $ git branch -r                        # list all remote branches
 -----------------------------------------------


@@ -4560,4 +4572,3 @@ Alternates, clone -reference, etc.
 More on recovery from repository corruption.  See:
        http://marc.theaimsgroup.com/?l=git&m=117263864820799&w=2
        http://marc.theaimsgroup.com/?l=git&m=117147855503798&w=2
 More on recovery from repository corruption.  See:
        http://marc.theaimsgroup.com/?l=git&m=117263864820799&w=2
        http://marc.theaimsgroup.com/?l=git&m=117147855503798&w=2

-       http://marc.theaimsgroup.com/?l=git&m=117147855503798&w=2