summaryrefslogtreecommitdiffstats
path: root/git-checkout.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2009-08-30 00:22:55 +0000
committerJunio C Hamano <junio@hera.kernel.org>2009-08-30 00:22:55 +0000
commit68cfa3a72aad7a8a26c410b479c09dd232a3d00d (patch)
treeaefd0198970923d67f5bdfee2d1cb680258cf598 /git-checkout.txt
parent1bb3199688345bc83c620de5be66b823ce099ea1 (diff)
downloadgit-htmldocs-68cfa3a72aad7a8a26c410b479c09dd232a3d00d.tar.gz
Autogenerated HTML docs for v1.6.4.2-236-gf324c
Diffstat (limited to 'git-checkout.txt')
-rw-r--r--git-checkout.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/git-checkout.txt b/git-checkout.txt
index ad4b31e89..b1314b561 100644
--- a/git-checkout.txt
+++ b/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.