From addf88e455f85bc6cfe0284b70aaad10b6d3486e Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Sun, 9 Jul 2006 03:44:30 -0400 Subject: Assorted typo fixes Signed-off-by: Junio C Hamano --- Documentation/git-push.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation/git-push.txt') diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt index d5b5ca167c..56afd64f42 100644 --- a/Documentation/git-push.txt +++ b/Documentation/git-push.txt @@ -67,7 +67,7 @@ Some short-cut notations are also supported. -f, \--force:: Usually, the command refuses to update a remote ref that is - not a descendent of the local ref used to overwrite it. + not a descendant of the local ref used to overwrite it. This flag disables the check. This can cause the remote repository to lose commits; use it with care. -- cgit v1.2.3 From 8f615493e6b6fd47bc4011c264cb7e6f01052d37 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Wed, 2 Aug 2006 11:28:16 -0400 Subject: 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 Signed-off-by: Junio C Hamano --- Documentation/git-push.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation/git-push.txt') diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt index 56afd64f42..d4ae99fa53 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] ... +'git-push' [--all] [--tags] [-f | --force] ... DESCRIPTION ----------- -- cgit v1.2.3