t3509: Add rename + D/F conflict testcase that recursive strategy fails

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 93e3b07c6cdf6c580cd7dff0d973478b91178481..e341075078f4511d2a40dca0a2c8ae1d342e6b17 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -639,6 +639,13 @@ Usually it is easier to configure any desired options through your
 personal `.ssh/config` file.  Please consult your ssh documentation
 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
+       and read the password from its STDOUT. See also the 'core.askpass'
+       option in linkgit:git-config[1].
+
 'GIT_FLUSH'::
        If this environment variable is set to "1", then commands such
        as 'git blame' (in incremental mode), 'git rev-list', 'git log',