summaryrefslogtreecommitdiff
path: root/Documentation/git-branch.txt
diff options
context:
space:
mode:
authorRené Scharfe <rene.scharfe@lsrfire.ath.cx>2009-08-29 11:05:00 +0200
committerJunio C Hamano <gitster@pobox.com>2009-08-29 14:08:03 -0700
commitf7aec129fa78e39e200352502377f57952516f98 (patch)
treeb6aa55c7e3089c2fe2da9eb1dcd1dfac4902ec2e /Documentation/git-branch.txt
parent53a1116c611e9e717d90e1406b29d97648460773 (diff)
downloadgit-f7aec129fa78e39e200352502377f57952516f98.tar.gz
UI consistency: allow --force for where -f means force
git branch, checkout, clean, mv and tag all have an option -f to override certain checks. This patch makes them accept the long option --force as a synonym. While we're at it, document that checkout support --quiet as synonym for its short option -q. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-branch.txt')
-rw-r--r--Documentation/git-branch.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index 99988872eb..aad71dc59a 100644
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -76,6 +76,7 @@ OPTIONS
based sha1 expressions such as "<branchname>@\{yesterday}".
-f::
+--force::
Reset <branchname> to <startpoint> if <branchname> exists
already. Without `-f` 'git-branch' refuses to change an existing branch.