summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-09-09 19:53:55 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-09-09 19:53:55 (GMT)
commit713c6f3ab06fcda921262b718742cff7f208da9a (patch)
treedc03df223426b7ddcd47397839a9747cd2b0d7b1 /Documentation
parent50b335b783680d402974b096e216cd3e823cf6b5 (diff)
parenta127b3f24d3a4f97fe53a3495d615a29b7ab8737 (diff)
downloadgit-713c6f3ab06fcda921262b718742cff7f208da9a.zip
git-713c6f3ab06fcda921262b718742cff7f208da9a.tar.gz
git-713c6f3ab06fcda921262b718742cff7f208da9a.tar.bz2
Merge branch 'bc/imap-send-doc'
* bc/imap-send-doc: imap-send doc: omit confusing "to use imap-send" modifier
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-imap-send.txt7
1 files changed, 3 insertions, 4 deletions
diff --git a/Documentation/git-imap-send.txt b/Documentation/git-imap-send.txt
index 875d283..eabcaf0 100644
--- a/Documentation/git-imap-send.txt
+++ b/Documentation/git-imap-send.txt
@@ -38,18 +38,17 @@ Variables
imap.folder::
The folder to drop the mails into, which is typically the Drafts
folder. For example: "INBOX.Drafts", "INBOX/Drafts" or
- "[Gmail]/Drafts". Required to use imap-send.
+ "[Gmail]/Drafts". Required.
imap.tunnel::
Command used to setup a tunnel to the IMAP server through which
commands will be piped instead of using a direct network connection
- to the server. Required when imap.host is not set to use imap-send.
+ to the server. Required when imap.host is not set.
imap.host::
A URL identifying the server. Use a `imap://` prefix for non-secure
connections and a `imaps://` prefix for secure connections.
- Ignored when imap.tunnel is set, but required to use imap-send
- otherwise.
+ Ignored when imap.tunnel is set, but required otherwise.
imap.user::
The username to use when logging in to the server.