Merge branch 'dg/filter-branch-filter-order-doc'

Update the documentation for "git filter-branch" so that the filter
options are listed in the same order as they are applied, as
described in an earlier part of the doc.

* dg/filter-branch-filter-order-doc:
doc: list filter-branch subdirectory-filter first

diff --cc Documentation/git-filter-branch.txt
index bebdcdec5ad4775588abe8814c59a269c7c1a832,394f74451a659cf5cbc22aaccb5937d2ac88ca29..3a52e4dce39eeaf6eba896ccbf9e0505cebb3ec9
--- 1/Documentation/git-filter-branch.txt
--- 2/Documentation/git-filter-branch.txt
+++ b/Documentation/git-filter-branch.txt
@@@ -8,13 -8,13 +8,13 @@@ git-filter-branch - Rewrite branche
  SYNOPSIS
  --------
  [verse]
- 'git filter-branch' [--setup <command>] [--env-filter <command>]
-       [--tree-filter <command>] [--index-filter <command>]
-       [--parent-filter <command>] [--msg-filter <command>]
-       [--commit-filter <command>] [--tag-name-filter <command>]
-       [--subdirectory-filter <directory>] [--prune-empty]
+ 'git filter-branch' [--setup <command>] [--subdirectory-filter <directory>]
+       [--env-filter <command>] [--tree-filter <command>]
+       [--index-filter <command>] [--parent-filter <command>]
+       [--msg-filter <command>] [--commit-filter <command>]
+       [--tag-name-filter <command>] [--prune-empty]
        [--original <namespace>] [-d <directory>] [-f | --force]
 -      [--] [<rev-list options>...]
 +      [--state-branch <branch>] [--] [<rev-list options>...]
  
  DESCRIPTION
  -----------

diff --cc git-filter-branch.sh
index 3365a3b866b510db5bf9ca20a0341c34c21b7a69,b7827e745a92a380bdb2e8c940a65742a7c43463..1b7e4b2cdbdf36e090c4b1f531dcc48222d8f8b1
--- 1/git-filter-branch.sh
--- 2/git-filter-branch.sh
+++ b/git-filter-branch.sh
@@@ -81,12 -81,12 +81,12 @@@ set_ident () 
        finish_ident COMMITTER
  }
  
- USAGE="[--setup <command>] [--env-filter <command>]
 -USAGE="[--setup <command>] [--subdirectory-filter <directory>]
 -      [--env-filter <command>] [--tree-filter <command>]
 -      [--index-filter <command>] [--parent-filter <command>]
 -      [--msg-filter <command>] [--commit-filter <command>]
 -      [--tag-name-filter <command>] [--prune-empty]
 -      [--original <namespace>] [-d <directory>] [-f | --force]
++USAGE="[--setup <command>] [--subdirectory-filter <directory>] [--env-filter <command>]
 +      [--tree-filter <command>] [--index-filter <command>]
 +      [--parent-filter <command>] [--msg-filter <command>]
 +      [--commit-filter <command>] [--tag-name-filter <command>]
-       [--subdirectory-filter <directory>] [--original <namespace>]
++      [--original <namespace>]
 +      [-d <directory>] [-f | --force] [--state-branch <branch>]
        [--] [<rev-list options>...]"
  
  OPTIONS_SPEC=