diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-06-06 23:49:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-06 23:49:28 -0700 |
| commit | 3ff7e178dc5c93e9d5b2738b1738a1a230a1b81a (patch) | |
| tree | 390381a4758d234cd6ce6b33633eab511d1966fb /Documentation | |
| parent | 6096d7598058d920485d206477f4383ba1a862cb (diff) | |
| parent | 801a011dcf41f0415dee81f0500673e058bdee30 (diff) | |
| download | git-3ff7e178dc5c93e9d5b2738b1738a1a230a1b81a.tar.gz git-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')
| -rw-r--r-- | Documentation/git.txt | 5 | ||||
| -rw-r--r-- | Documentation/gittutorial.txt | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/Documentation/git.txt b/Documentation/git.txt index 68ce6e01b..56d47709a 100644 --- 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 --- diff --git a/Documentation/gittutorial.txt b/Documentation/gittutorial.txt index c5d5596d8..c7fa949c2 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] |