summaryrefslogtreecommitdiffstats
path: root/git-checkout.html
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.html
parent1bb3199688345bc83c620de5be66b823ce099ea1 (diff)
downloadgit-htmldocs-68cfa3a72aad7a8a26c410b479c09dd232a3d00d.tar.gz
Autogenerated HTML docs for v1.6.4.2-236-gf324c
Diffstat (limited to 'git-checkout.html')
-rw-r--r--git-checkout.html8
1 files changed, 7 insertions, 1 deletions
diff --git a/git-checkout.html b/git-checkout.html
index bacc89509..b7f798233 100644
--- a/git-checkout.html
+++ b/git-checkout.html
@@ -357,6 +357,9 @@ file can be discarded to recreate the original conflicted merge result.</p></div
<dt>
-q
</dt>
+<dt>
+--quiet
+</dt>
<dd>
<p>
Quiet, suppress feedback messages.
@@ -365,6 +368,9 @@ file can be discarded to recreate the original conflicted merge result.</p></div
<dt>
-f
</dt>
+<dt>
+--force
+</dt>
<dd>
<p>
When switching branches, proceed even if the index or the
@@ -652,7 +658,7 @@ $ git add frotz</tt></pre>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-07-01 02:30:44 UTC
+Last updated 2009-08-30 00:22:35 UTC
</div>
</div>
</body>