Merge branch 'tz/maint-rpm' into maint

diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index 26a5447fbfd2c6ec2c23d6328314024712601c92..37c1810e3fc8424868333a22094107e99764fc37 100644 (file)
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -46,9 +46,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.