git-show-branch doc: show -g as synonym to --reflog in the list

[git.git] / Documentation / gittutorial.txt

diff --git a/Documentation/gittutorial.txt b/Documentation/gittutorial.txt
index 384972cb9bb4a04c55bd8c4796bcd3408e44d5e9..c5d5596d895755d69c8060bc38a800d7c70eda26 100644 (file)
--- a/Documentation/gittutorial.txt
+++ b/Documentation/gittutorial.txt
@@ -26,6 +26,15 @@ First, note that you can get documentation for a command such as
 $ man git-log
 ------------------------------------------------
 
 $ man git-log
 ------------------------------------------------
 

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

 It is a good idea to introduce yourself to git with your name and
 public email address before doing any operation.  The easiest
 way to do so is:
 It is a good idea to introduce yourself to git with your name and
 public email address before doing any operation.  The easiest
 way to do so is:


@@ -299,9 +308,7 @@ alice$ git pull /home/bob/myrepo master
 
 This merges the changes from Bob's "master" branch into Alice's
 current branch.  If Alice has made her own changes in the meantime,
 
 This merges the changes from Bob's "master" branch into Alice's
 current branch.  If Alice has made her own changes in the meantime,

-then she may need to manually fix any conflicts.  (Note that the
-"master" argument in the above command is actually unnecessary, as it
-is the default.)
+then she may need to manually fix any conflicts.

 
 The "pull" command thus performs two operations: it fetches changes
 from a remote branch, then merges them into the current branch.
 
 The "pull" command thus performs two operations: it fetches changes
 from a remote branch, then merges them into the current branch.


@@ -581,7 +588,7 @@ list.  When the history has lines of development that diverged and
 then merged back together, the order in which 'git-log' presents
 those commits is meaningless.
 
 then merged back together, the order in which 'git-log' presents
 those commits is meaningless.
 

-Most projects with multiple contributors (such as the linux kernel,
+Most projects with multiple contributors (such as the Linux kernel,

 or git itself) have frequent merges, and 'gitk' does a better job of
 visualizing their history.  For example,
 
 or git itself) have frequent merges, and 'gitk' does a better job of
 visualizing their history.  For example,
 


@@ -633,7 +640,7 @@ digressions that may be interesting at this point are:
 
   * linkgit:git-format-patch[1], linkgit:git-am[1]: These convert
     series of git commits into emailed patches, and vice versa,
 
   * linkgit:git-format-patch[1], linkgit:git-am[1]: These convert
     series of git commits into emailed patches, and vice versa,

-    useful for projects such as the linux kernel which rely heavily
+    useful for projects such as the Linux kernel which rely heavily

     on emailed patches.
 
   * linkgit:git-bisect[1]: When there is a regression in your
     on emailed patches.
 
   * linkgit:git-bisect[1]: When there is a regression in your


@@ -653,6 +660,7 @@ linkgit:gittutorial-2[7],
 linkgit:gitcvs-migration[7],
 linkgit:gitcore-tutorial[7],
 linkgit:gitglossary[7],
 linkgit:gitcvs-migration[7],
 linkgit:gitcore-tutorial[7],
 linkgit:gitglossary[7],

+linkgit:git-help[1],

 link:everyday.html[Everyday git],
 link:user-manual.html[The Git User's Manual]
 
 link:everyday.html[Everyday git],
 link:user-manual.html[The Git User's Manual]