From: Junio C Hamano Date: Wed, 7 Jan 2009 08:10:19 +0000 (-0800) Subject: Merge branch 'mh/maint-sendmail-cc-doc' X-Git-Tag: v1.6.2-rc0~182 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c123b7c5fb596d93cd015645212c379fc3c381d5?ds=inline;hp=-c Merge branch 'mh/maint-sendmail-cc-doc' * mh/maint-sendmail-cc-doc: doc/git-send-email: mention sendemail.cc config variable --- c123b7c5fb596d93cd015645212c379fc3c381d5 diff --combined Documentation/git-send-email.txt index b69846e522,2b6d68c498..ff4aeff4e6 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt @@@ -34,6 -34,7 +34,7 @@@ The --bcc option must be repeated for e --cc:: Specify a starting "Cc:" value for each email. + Default is the value of 'sendemail.cc'. + The --cc option must be repeated for each user you want on the cc list. @@@ -197,6 -198,12 +198,6 @@@ Administerin --[no-]validate:: Perform sanity checks on patches. Currently, validation means the following: - ---[no-]format-patch:: - When an argument may be understood either as a reference or as a file name, - choose to understand it as a format-patch argument ('--format-patch') - or as a file name ('--no-format-patch'). By default, when such a conflict - occurs, git send-email will fail. + -- * Warn of patches that contain lines longer than 998 characters; this @@@ -206,12 -213,6 +207,12 @@@ Default is the value of 'sendemail.validate'; if this is not set, default to '--validate'. +--[no-]format-patch:: + When an argument may be understood either as a reference or as a file name, + choose to understand it as a format-patch argument ('--format-patch') + or as a file name ('--no-format-patch'). By default, when such a conflict + occurs, git send-email will fail. + CONFIGURATION -------------