Documentation: refer to gitworkflows(7) from tutorial and git(1)

Add references to the gitworkflows(7) manpage added in f948dd8
(Documentation: add manpage about workflows, 2008-10-19) to both
gittutorial(1) and git(1), so that new users might actually discover
and read it.

Noticed by Randal L. Schwartz.

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 9d8f236fe84cd02550b8cf08e835b2926e6c45f0..3589a12e49cc6547469f0bd5c254cc547fd2863f 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -227,6 +227,8 @@ The link:user-manual.html#git-concepts[git concepts chapter of the
 user-manual] and linkgit:gitcore-tutorial[7] both provide
 introductions to the underlying git architecture.
 
 user-manual] and linkgit:gitcore-tutorial[7] both provide
 introductions to the underlying git architecture.
 

+See linkgit:gitworkflows[7] for an overview of recommended workflows.
+

 See also the link:howto-index.html[howto] documents for some useful
 examples.
 
 See also the link:howto-index.html[howto] documents for some useful
 examples.
 


@@ -644,7 +646,8 @@ SEE ALSO
 linkgit:gittutorial[7], linkgit:gittutorial-2[7],
 link:everyday.html[Everyday Git], linkgit:gitcvs-migration[7],
 linkgit:gitglossary[7], linkgit:gitcore-tutorial[7],
 linkgit:gittutorial[7], linkgit:gittutorial-2[7],
 link:everyday.html[Everyday Git], linkgit:gitcvs-migration[7],
 linkgit:gitglossary[7], linkgit:gitcore-tutorial[7],

-linkgit:gitcli[7], link:user-manual.html[The Git User's Manual]
+linkgit:gitcli[7], link:user-manual.html[The Git User's Manual],
+linkgit:gitworkflows[7]

 
 GIT
 ---
 
 GIT
 ---

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


@@ -661,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]