X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-rebase.txt;h=db1b71d24846e4561d99bed095345eb9580b0632;hb=dd787c19c4f011cc3adb422ef856f2c58d989640;hp=3d5a066c31675e502eb027dde824d1966c9c0f09;hpb=a0c0447b8eda07529eec2ae8fbc6bf68e1ff2d67;p=git.git

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 3d5a066c3..db1b71d24 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -231,12 +231,15 @@ OPTIONS
 
 -s <strategy>::
 --strategy=<strategy>::
-	Use the given merge strategy; can be supplied more than
-	once to specify them in the order they should be tried.
+	Use the given merge strategy.
 	If there is no `-s` option, a built-in list of strategies
 	is used instead ('git-merge-recursive' when merging a single
 	head, 'git-merge-octopus' otherwise).  This implies --merge.
 
+-q::
+--quiet::
+	Be quiet. Implies --no-stat.
+
 -v::
 --verbose::
 	Be verbose. Implies --stat.