Merge branches 'jc/rev-list' and 'jc/pack-thin'

diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt
index 064ccb1f8707bc6e82d43bcabb20bb30aec6236f..1c6146c7643ef273888b76def0891b8a7ad51c98 100644 (file)
--- a/Documentation/git-rev-list.txt
+++ b/Documentation/git-rev-list.txt
@@ -8,18 +8,20 @@ git-rev-list - Lists commit objects in reverse chronological order
 
 SYNOPSIS
 --------
+[verse]
 'git-rev-list' [ \--max-count=number ]
-       [ \--max-age=timestamp ]
-       [ \--min-age=timestamp ]
-       [ \--sparse ]
-       [ \--no-merges ]
-       [ \--all ]
-       [ [ \--merge-order [ \--show-breaks ] ] | [ \--topo-order ] | ]
-       [ \--parents ]
-       [ \--objects [ \--unpacked ] ]
-       [ \--pretty | \--header | ]
-       [ \--bisect ]
-       <commit>... [ \-- <paths>... ]
+            [ \--max-age=timestamp ]
+            [ \--min-age=timestamp ]
+            [ \--sparse ]
+            [ \--no-merges ]
+            [ \--remove-empty ]
+            [ \--all ]
+            [ [ \--merge-order [ \--show-breaks ] ] | [ \--topo-order ] ]
+            [ \--parents ]
+            [ \--objects [ \--unpacked ] ]
+            [ \--pretty | \--header ]
+            [ \--bisect ]
+            <commit>... [ \-- <paths>... ]
 
 DESCRIPTION
 -----------
@@ -79,6 +81,9 @@ OPTIONS
        (still subject to count and age limitation), but apply
        merge simplification nevertheless.
 
+--remove-empty::
+       Stop when a given path disappears from the tree.
+
 --all::
        Pretend as if all the refs in `$GIT_DIR/refs/` are
        listed on the command line as <commit>.
@@ -129,7 +134,7 @@ the marked commit in the list.
 +
 Commits marked with (^) are not parents of the immediately preceding commit.
 These "breaks" represent necessary discontinuities implied by trying to
-represent an arbtirary DAG in a linear form.
+represent an arbitrary DAG in a linear form.
 +
 `--show-breaks` is only valid if `--merge-order` is also specified.