From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 21 Apr 2015 19:58:50 +0000 (-0700)
Subject: Sync with maint
X-Git-Tag: v2.4.0-rc3~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/fb896362cc12dfc0df69be6c9d75936f9c7cc7ff?ds=inline;hp=-c

Sync with maint
---

fb896362cc12dfc0df69be6c9d75936f9c7cc7ff
diff --combined Documentation/git.txt
index 59e8335055,085bc34eb1..e125c4227f
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -43,9 -43,10 +43,10 @@@ unreleased) version of Git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
- * link:v2.3.5/git.html[documentation for release 2.3.5]
+ * link:v2.3.6/git.html[documentation for release 2.3.6]
  
  * release notes for
+   link:RelNotes/2.3.6.txt[2.3.6],
    link:RelNotes/2.3.5.txt[2.3.5],
    link:RelNotes/2.3.4.txt[2.3.4],
    link:RelNotes/2.3.3.txt[2.3.3],
@@@ -922,7 -923,7 +923,7 @@@ for further details
  	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
 -	and read the password from its STDOUT. See also the 'core.askpass'
 +	and read the password from its STDOUT. See also the 'core.askPass'
  	option in linkgit:git-config[1].
  
  'GIT_TERMINAL_PROMPT'::