summaryrefslogtreecommitdiff
path: root/Documentation/git-checkout.txt
diff options
context:
space:
mode:
authorRené Scharfe <rene.scharfe@lsrfire.ath.cx>2009-08-29 09:05:00 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-08-29 21:08:03 (GMT)
commitf7aec129fa78e39e200352502377f57952516f98 (patch)
treeb6aa55c7e3089c2fe2da9eb1dcd1dfac4902ec2e /Documentation/git-checkout.txt
parent53a1116c611e9e717d90e1406b29d97648460773 (diff)
downloadgit-f7aec129fa78e39e200352502377f57952516f98.zip
git-f7aec129fa78e39e200352502377f57952516f98.tar.gz
git-f7aec129fa78e39e200352502377f57952516f98.tar.bz2
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-checkout.txt')
-rw-r--r--Documentation/git-checkout.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index ad4b31e..b1314b5 100644
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -45,9 +45,11 @@ file can be discarded to recreate the original conflicted merge result.
OPTIONS
-------
-q::
+--quiet::
Quiet, suppress feedback messages.
-f::
+--force::
When switching branches, proceed even if the index or the
working tree differs from HEAD. This is used to throw away
local changes.