Git 1.7.6.6

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index e33e0f8e110879a0cd6fe81d97ee6044290e5cfa..b613d4ed083d080797f7da90fc92212f98611d07 100644 (file)
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -75,9 +75,17 @@ option can be used to override --squash.
 ifndef::git-pull[]
 -q::
 --quiet::
-       Operate quietly.
+       Operate quietly. Implies --no-progress.
 
 -v::
 --verbose::
        Be verbose.
+
+--progress::
+--no-progress::
+       Turn progress on/off explicitly. If neither is specified,
+       progress is shown if standard error is connected to a terminal.
+       Note that not all merge strategies may support progress
+       reporting.
+
 endif::git-pull[]