Merge branch 'cb/send-email-help'

* cb/send-email-help:
  send-email: add option -h
This commit is contained in:
Junio C Hamano 2011-10-05 12:36:23 -07:00
Родитель 6cf5b81f32 c5978246f0
Коммит 3c18ee72cc
1 изменённых файлов: 4 добавлений и 1 удалений

Просмотреть файл

@ -275,7 +275,9 @@ $SIG{INT} = \&signal_handler;
# Begin by accumulating all the variables (defined above), that we will end up
# needing, first, from the command line:
my $rc = GetOptions("sender|from=s" => \$sender,
my $help;
my $rc = GetOptions("h" => \$help,
"sender|from=s" => \$sender,
"in-reply-to=s" => \$initial_reply_to,
"subject=s" => \$initial_subject,
"to=s" => \@initial_to,
@ -313,6 +315,7 @@ my $rc = GetOptions("sender|from=s" => \$sender,
"force" => \$force,
);
usage() if $help;
unless ($rc) {
usage();
}