Teach receive-pack to run pre-receive/post-receive hooks

diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index 481b3f50e3d690f5cd47ffa2c2d8bb645114e315..35b0104e4acbe614fb274c1ee36d6a4ab2ea5849 100644 (file)
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -26,13 +26,13 @@ The options available are:
 
 --bcc::
        Specify a "Bcc:" value for each email.
-
-       The --bcc option must be repeated for each user you want on the bcc list.
++
+The --bcc option must be repeated for each user you want on the bcc list.
 
 --cc::
        Specify a starting "Cc:" value for each email.
-
-       The --cc option must be repeated for each user you want on the cc list.
++
+The --cc option must be repeated for each user you want on the cc list.
 
 --chain-reply-to, --no-chain-reply-to::
        If this is set, each email will be sent as a reply to the previous
@@ -66,8 +66,13 @@ The options available are:
        all that is output.
 
 --smtp-server::
-       If set, specifies the outgoing SMTP server to use.  Defaults to
-       localhost.
+       If set, specifies the outgoing SMTP server to use.  A full
+       pathname of a sendmail-like program can be specified instead;
+       the program must support the `-i` option.  Default value can
+       be specified by the 'sendemail.smtpserver' configuration
+       option; the built-in default is `/usr/sbin/sendmail` or
+       `/usr/lib/sendmail` if such program is available, or
+       `localhost` otherwise.
 
 --subject::
        Specify the initial subject of the email thread.
@@ -82,8 +87,8 @@ The options available are:
        Specify the primary recipient of the emails generated.
        Generally, this will be the upstream maintainer of the
        project involved.
-
-       The --to option must be repeated for each user you want on the to list.
++
+The --to option must be repeated for each user you want on the to list.
 
 
 Author