aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/git-imap-send.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-04-18 14:45:59 -0700
committerJunio C Hamano <gitster@pobox.com>2009-04-18 14:45:59 -0700
commitcef5775b9f640beb51b07f8a296cfcc9b11b9744 (patch)
tree1bc646b4ffaa3d8cdd8bae0262e7eae839faa728 /Documentation/git-imap-send.txt
parent1a1f063a1738f8e59c26fccdf3f60580edde3dbe (diff)
parent67daebfd3b9ba020d677e069000782b9b1e8cf75 (diff)
downloadgit-cef5775b9f640beb51b07f8a296cfcc9b11b9744.tar.gz
Merge branch 'maint'
* maint: Describe fixes since 1.6.2.3 doc/git-daemon: add missing arguments to max-connections option doc/git-daemon: add missing arguments to options init: Do not segfault on big GIT_TEMPLATE_DIR environment variable imap-send: use correct configuration variable in documentation
Diffstat (limited to 'Documentation/git-imap-send.txt')
-rw-r--r--Documentation/git-imap-send.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-imap-send.txt b/Documentation/git-imap-send.txt
index 024084b8b7..d016dafd49 100644
--- a/Documentation/git-imap-send.txt
+++ b/Documentation/git-imap-send.txt
@@ -51,7 +51,7 @@ imap.host::
imap.user::
The username to use when logging in to the server.
-imap.password::
+imap.pass::
The password to use when logging in to the server.
imap.port::