diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-03-11 23:53:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-11 23:53:52 -0700 |
| commit | 240c77c7146a58834cf7e425bde956b646c69024 (patch) | |
| tree | 19710f73b22c9962f6cb6979db5bf8bd413af323 /Documentation | |
| parent | 2422f1ca3b94358e88f8508730a9d8ebcf020547 (diff) | |
| parent | fc095242b16d57bad1bfe089f919b9d6e6deda1b (diff) | |
| download | git-240c77c7146a58834cf7e425bde956b646c69024.tar.gz | |
Merge branch 'maint'
* maint:
git-send-email: Document configuration options
git-merge: warn when -m provided on a fast forward
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-send-email.txt | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt index 35b0104e4a..367646efab 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt @@ -91,6 +91,19 @@ The --cc option must be repeated for each user you want on the cc list. The --to option must be repeated for each user you want on the to list. +CONFIGURATION +------------- +sendemail.aliasesfile:: + To avoid typing long email addresses, point this to one or more + email aliases files. You must also supply 'sendemail.aliasfiletype'. + +sendemail.aliasfiletype:: + Format of the file(s) specified in sendemail.aliasesfile. Must be + one of 'mutt', 'mailrc', 'pine', or 'gnus'. + +sendemail.smtpserver:: + Default smtp server to use. + Author ------ Written by Ryan Anderson <ryan@michonline.com> |