From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 25 Jun 2014 19:32:58 +0000 (-0700)
Subject: Sync with maint
X-Git-Tag: v2.1.0-rc0~76
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c47372d3a8a9fb7892cc1aa5cc5df7b6c1e61751?ds=inline;hp=-c

Sync with maint
---

c47372d3a8a9fb7892cc1aa5cc5df7b6c1e61751
diff --combined Documentation/git.txt
index 3bd68b0167,3d9c6d1743..7924209671
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -29,7 -29,7 +29,7 @@@ in-depth introduction
  After you mastered the basic concepts, you can come back to this
  page to learn what commands Git offers.  You can learn more about
  individual Git commands with "git help command".  linkgit:gitcli[7]
 -manual page gives you an overview of the command line command syntax.
 +manual page gives you an overview of the command-line command syntax.
  
  Formatted and hyperlinked version of the latest Git documentation
  can be viewed at `http://git-htmldocs.googlecode.com/git/git.html`.
@@@ -39,13 -39,14 +39,14 @@@ ifdef::stalenotes[
  ============
  
  You are reading the documentation for the latest (possibly
 -unreleased) version of Git, that is available from 'master'
 +unreleased) version of Git, that is available from the 'master'
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
- * link:v2.0.0/git.html[documentation for release 2.0]
+ * link:v2.0.1/git.html[documentation for release 2.0.1]
  
  * release notes for
+   link:RelNotes/2.0.1.txt[2.0.1],
    link:RelNotes/2.0.0.txt[2.0.0].
  
  * link:v1.9.4/git.html[documentation for release 1.9.4]
@@@ -755,7 -756,7 +756,7 @@@ Git so take care if using Cogito etc
  
  'GIT_WORK_TREE'::
  	Set the path to the root of the working tree.
 -	This can also be controlled by the '--work-tree' command line
 +	This can also be controlled by the '--work-tree' command-line
  	option and the core.worktree configuration variable.
  
  'GIT_NAMESPACE'::
@@@ -880,7 -881,7 +881,7 @@@ for further details
  'GIT_ASKPASS'::
  	If this environment variable is set, then Git commands which need to
  	acquire passwords or passphrases (e.g. for HTTP or IMAP authentication)
 -	will call this program with a suitable prompt as command line argument
 +	will call this program with a suitable prompt as command-line argument
  	and read the password from its STDOUT. See also the 'core.askpass'
  	option in linkgit:git-config[1].