Merge branch 'rc/maint-http-local-slot-fix'

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 68ce6e01b118ed77493e31b25ce3799c07e7f4fd..56d47709ac9ec698405215ecac13d66d7c773848 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -232,6 +232,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.
 
+See linkgit:gitworkflows[7] for an overview of recommended workflows.
+
 See also the link:howto-index.html[howto] documents for some useful
 examples.
 
@@ -649,7 +651,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: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
 ---