diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-05-23 01:43:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-23 01:43:26 -0700 |
| commit | 212fa1d96040a01054d6bd92ee2bb74fe7071d33 (patch) | |
| tree | edc084e738b88a7401957aaa7f9c805058d96611 /Documentation | |
| parent | Merge branch 'js/maint-no-ln-across-libexec-and-bin' (diff) | |
| parent | send-email: Add config option for sender address (diff) | |
| download | tgif-212fa1d96040a01054d6bd92ee2bb74fe7071d33.tar.xz | |
Merge branch 'tp/send-email-from-config'
* tp/send-email-from-config:
send-email: Add config option for sender address
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-send-email.txt | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt index 794224b1b3..f940770279 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt @@ -69,9 +69,12 @@ and In-Reply-To headers will be used unless they are removed. Missing From or In-Reply-To headers will be prompted for. --from=<address>:: - Specify the sender of the emails. This will default to - the value GIT_COMMITTER_IDENT, as returned by "git var -l". - The user will still be prompted to confirm this entry. + Specify the sender of the emails. If not specified on the command line, + the value of the 'sendemail.from' configuration option is used. If + neither the command line option nor 'sendemail.from' are set, then the + user will be prompted for the value. The default for the prompt will be + the value of GIT_AUTHOR_IDENT, or GIT_COMMITTER_IDENT if that is not + set, as returned by "git var -l". --in-reply-to=<identifier>:: Specify the contents of the first In-Reply-To header. |