summaryrefslogtreecommitdiff
path: root/Documentation/gittutorial.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-06-06 23:49:28 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-06-06 23:49:28 -0700
commit3ff7e178dc5c93e9d5b2738b1738a1a230a1b81a (patch)
tree390381a4758d234cd6ce6b33633eab511d1966fb /Documentation/gittutorial.txt
parentDocumentation/git.txt: update links to release notes (diff)
parentDocumentation: refer to gitworkflows(7) from tutorial and git(1) (diff)
downloadtgif-3ff7e178dc5c93e9d5b2738b1738a1a230a1b81a.tar.xz
Merge branch 'maint'
* maint: Documentation: refer to gitworkflows(7) from tutorial and git(1) daemon: Strictly parse the "extra arg" part of the command
Diffstat (limited to 'Documentation/gittutorial.txt')
-rw-r--r--Documentation/gittutorial.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/gittutorial.txt b/Documentation/gittutorial.txt
index c5d5596d89..c7fa949c28 100644
--- 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.
+ * 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.
@@ -661,6 +664,7 @@ linkgit:gitcvs-migration[7],
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]