merge: make branch.<name>.mergeoptions correctly override merge.<option>

[git.git] / Documentation / git-imap-send.txt

diff --git a/Documentation/git-imap-send.txt b/Documentation/git-imap-send.txt
index 024084b8b717d680c274737a14f609d299b6daa8..57db955bd4cc82f643ed5b932b33d440d8cf409a 100644 (file)
--- a/Documentation/git-imap-send.txt
+++ b/Documentation/git-imap-send.txt
@@ -13,7 +13,7 @@ SYNOPSIS
 
 DESCRIPTION
 -----------
 
 DESCRIPTION
 -----------

-This command uploads a mailbox generated with 'git-format-patch'
+This command uploads a mailbox generated with 'git format-patch'

 into an IMAP drafts folder.  This allows patches to be sent as
 other email is when using mail clients that cannot read mailbox
 files directly.
 into an IMAP drafts folder.  This allows patches to be sent as
 other email is when using mail clients that cannot read mailbox
 files directly.


@@ -51,7 +51,7 @@ imap.host::
 imap.user::
        The username to use when logging in to the server.
 
 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::
        The password to use when logging in to the server.
 
 imap.port::