git-archive: infer output format from filename when unspecified

diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index 7dd237c2f66d81aebf59add2787aa822c94d9b92..bf66116d61af4f16cff59ed1563f38736a14ecce 100644 (file)
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -140,38 +140,38 @@ limiting may be applied.
 --
 
 -n 'number'::
---max-count='number'::
+--max-count=<number>::
 
        Limit the number of commits output.
 
---skip='number'::
+--skip=<number>::
 
        Skip 'number' commits before starting to show the commit output.
 
---since='date'::
---after='date'::
+--since=<date>::
+--after=<date>::
 
        Show commits more recent than a specific date.
 
---until='date'::
---before='date'::
+--until=<date>::
+--before=<date>::
 
        Show commits older than a specific date.
 
 ifdef::git-rev-list[]
---max-age='timestamp'::
---min-age='timestamp'::
+--max-age=<timestamp>::
+--min-age=<timestamp>::
 
        Limit the commits output to specified time range.
 endif::git-rev-list[]
 
---author='pattern'::
---committer='pattern'::
+--author=<pattern>::
+--committer=<pattern>::
 
        Limit the commits output to ones with author/committer
        header lines that match the specified pattern (regular expression).
 
---grep='pattern'::
+--grep=<pattern>::
 
        Limit the commits output to ones with log message that
        matches the specified pattern (regular expression).
@@ -201,6 +201,10 @@ endif::git-rev-list[]
 
        Stop when a given path disappears from the tree.
 
+--merges::
+
+       Print only merge commits.
+
 --no-merges::
 
        Do not print commits with more than one parent.