From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 7 Jun 2009 06:49:28 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.4-rc0~83
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3ff7e178dc5c93e9d5b2738b1738a1a230a1b81a?ds=inline;hp=-c

Merge branch 'maint'

* maint:
Documentation: refer to gitworkflows(7) from tutorial and git(1)
daemon: Strictly parse the "extra arg" part of the command
---

3ff7e178dc5c93e9d5b2738b1738a1a230a1b81a
diff --combined Documentation/git.txt
index 68ce6e01b1,3589a12e49..56d47709ac
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -43,12 -43,7 +43,12 @@@ unreleased) version of git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
 -* link:v1.6.3/git.html[documentation for release 1.6.3]
 +* link:v1.6.3.2/git.html[documentation for release 1.6.3.2]
 +
 +* release notes for
 +  link:RelNotes-1.6.3.2.txt[1.6.3.2],
 +  link:RelNotes-1.6.3.1.txt[1.6.3.1],
 +  link:RelNotes-1.6.3.txt[1.6.3].
  
  * release notes for
    link:RelNotes-1.6.2.5.txt[1.6.2.5],
@@@ -232,6 -227,8 +232,8 @@@ The link:user-manual.html#git-concepts[
  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 -646,8 +651,8 @@@ SEE ALS
  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
  ---