Merge branch 'sb/submodule-path-misc-bugs' into sb/submodule-init

diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index e269fb110835305633ccafa6aa87cf1f425f7b8c..5e5273e073c351a3c845043a69916a1773cefd94 100644 (file)
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -107,6 +107,12 @@ OPTIONS
 --quiet::
        Quiet, suppress feedback messages.
 
+--[no-]progress::
+       Progress status is reported on the standard error stream
+       by default when it is attached to a terminal, unless `--quiet`
+       is specified. This flag enables progress reporting even if not
+       attached to a terminal, regardless of `--quiet`.
+
 -f::
 --force::
        When switching branches, proceed even if the index or the