From: Jeff King <peff@peff.net>
Date: Wed, 2 Aug 2006 15:28:16 +0000 (-0400)
Subject: git-push: allow -f as an alias for --force
X-Git-Tag: v1.4.2-rc3~16
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8f615493e6b6fd47bc4011c264cb7e6f01052d37;p=git.git

git-push: allow -f as an alias for --force

This was already documented in the options section of the manpage. This
patch implements it, adds it to the usage message, and mentions it at the
top of the manpage.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index 56afd64f4..d4ae99fa5 100644
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -8,7 +8,7 @@ git-push - Update remote refs along with associated objects
 
 SYNOPSIS
 --------
-'git-push' [--all] [--tags] [--force] <repository> <refspec>...
+'git-push' [--all] [--tags] [-f | --force] <repository> <refspec>...
 
 DESCRIPTION
 -----------
diff --git a/builtin-push.c b/builtin-push.c
index a82417106..c39dd1e09 100644
--- a/builtin-push.c
+++ b/builtin-push.c
@@ -8,7 +8,7 @@
 
 #define MAX_URI (16)
 
-static const char push_usage[] = "git push [--all] [--tags] [--force] <repository> [<refspec>...]";
+static const char push_usage[] = "git push [--all] [--tags] [-f | --force] <repository> [<refspec>...]";
 
 static int all = 0, tags = 0, force = 0, thin = 1;
 static const char *execute = NULL;
@@ -291,7 +291,7 @@ int cmd_push(int argc, const char **argv, const char *prefix)
 			tags = 1;
 			continue;
 		}
-		if (!strcmp(arg, "--force")) {
+		if (!strcmp(arg, "--force") || !strcmp(arg, "-f")) {
 			force = 1;
 			continue;
 		}