* Accept -n as a synonym for --dry-run
* Accept -f as a synonym for --force
* Accept -q as a synonym for --quiet
Signed-off-by: Alejandro R. SedeÃo <asedeno@xxxxxxx>
---
Documentation/git-send-email.txt | 3 +++
git-send-email.perl | 12 ++++++------
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index 7ec9dab..2d0faf2 100644
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -297,6 +297,7 @@ Default is the value of 'sendemail.confirm' configuration value; if that
is unspecified, default to 'auto' unless any of the suppress options
have been specified, in which case default to 'compose'.
+-n::
--dry-run::
Do everything except actually send the emails.
@@ -306,6 +307,7 @@ have been specified, in which case default to 'compose'.
or as a file name ('--no-format-patch'). By default, when such a conflict
occurs, git send-email will fail.
+-q::
--quiet::
Make git-send-email less verbose. One line per email should be
all that is output.
@@ -322,6 +324,7 @@ have been specified, in which case default to 'compose'.
Default is the value of 'sendemail.validate'; if this is not set,
default to '--validate'.
+-f::
--force::
Send emails even if safety checks would prevent it.
diff --git a/git-send-email.perl b/git-send-email.perl
index 76565de..ede7835 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -84,12 +84,12 @@ git send-email [options] <file | directory | rev-list options >
Administering:
--confirm <str> * Confirm recipients before sending;
auto, cc, compose, always, or never.
- --quiet * Output one line of info per email.
- --dry-run * Don't actually send the emails.
+ -q, --quiet * Output one line of info per email.
+ -n, --dry-run * Don't actually send the emails.
--[no-]validate * Perform patch sanity checks. Default on.
--[no-]format-patch * understand any non optional arguments as
`git format-patch` ones.
- --force * Send even if safety checks would prevent it.
+ -f, --force * Send even if safety checks would prevent it.
EOT
exit(1);
@@ -298,19 +298,19 @@ my $rc = GetOptions("sender|from=s" => \$sender,
"identity=s" => \$identity,
"annotate" => \$annotate,
"compose" => \$compose,
- "quiet" => \$quiet,
+ "quiet|q" => \$quiet,
"cc-cmd=s" => \$cc_cmd,
"suppress-from!" => \$suppress_from,
"suppress-cc=s" => \@suppress_cc,
"signed-off-cc|signed-off-by-cc!" => \$signed_off_by_cc,
"confirm=s" => \$confirm,
- "dry-run" => \$dry_run,
+ "dry-run|n" => \$dry_run,
"envelope-sender=s" => \$envelope_sender,
"thread!" => \$thread,
"validate!" => \$validate,
"format-patch!" => \$format_patch,
"8bit-encoding=s" => \$auto_8bit_encoding,
- "force" => \$force,
+ "force|f" => \$force,
);
unless ($rc) {
--
1.7.3.3
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html