Merge branch 'da/araxis-mergetool'

[git.git] / Documentation / gittutorial.txt

diff --git a/Documentation/gittutorial.txt b/Documentation/gittutorial.txt
index 458fafdb2cc7e54c5e2f49ca5854e6ec9fe581ee..c7fa949c287f76c5ab8173d975f6da3dd92e6802 100644 (file)
--- a/Documentation/gittutorial.txt
+++ b/Documentation/gittutorial.txt
@@ -308,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.


@@ -652,6 +650,9 @@ digressions that may be interesting at this point are:
     smart enough to perform a close-to-optimal search even in the
     case of complex non-linear history with lots of merged branches.
 
     smart enough to perform a close-to-optimal search even in the
     case of complex non-linear history with lots of merged branches.
 

+  * linkgit:gitworkflows[7]: Gives an overview of recommended
+    workflows.
+

   * link:everyday.html[Everyday GIT with 20 Commands Or So]
 
   * linkgit:gitcvs-migration[7]: Git for CVS users.
   * link:everyday.html[Everyday GIT with 20 Commands Or So]
 
   * linkgit:gitcvs-migration[7]: Git for CVS users.


@@ -663,6 +664,7 @@ linkgit:gitcvs-migration[7],
 linkgit:gitcore-tutorial[7],
 linkgit:gitglossary[7],
 linkgit:git-help[1],
 linkgit:gitcore-tutorial[7],
 linkgit:gitglossary[7],
 linkgit:git-help[1],

+linkgit:gitworkflows[7],

 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]