diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-01-09 15:56:58 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-09 15:56:58 -0800 |
| commit | e1e3c0694e6b37273820f28a782b927ec345ff2b (patch) | |
| tree | 659e87260b98cfdfd04f0981de951c56f09e42e2 | |
| parent | eac2d83247ea0a265d923518c26873bb12c33778 (diff) | |
| parent | 829a1c616967176ccd859c18a6e8ca0dda77f75a (diff) | |
| download | git-e1e3c0694e6b37273820f28a782b927ec345ff2b.tar.gz | |
Merge branch 'maint'
* maint:
send-email: multiedit is a boolean config option
| -rwxr-xr-x | git-send-email.perl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-send-email.perl b/git-send-email.perl index d491db92c9..ef30c557c7 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -210,6 +210,7 @@ my %config_bool_settings = ( "signedoffbycc" => [\$signed_off_by_cc, undef], "signedoffcc" => [\$signed_off_by_cc, undef], # Deprecated "validate" => [\$validate, 1], + "multiedit" => [\$multiedit, undef] ); my %config_settings = ( @@ -227,7 +228,6 @@ my %config_settings = ( "bcc" => \@bcclist, "suppresscc" => \@suppress_cc, "envelopesender" => \$envelope_sender, - "multiedit" => \$multiedit, "confirm" => \$confirm, "from" => \$sender, "assume8bitencoding" => \$auto_8bit_encoding, |