Merge branch 'dg/filter-branch-filter-order-doc'
authorJunio C Hamano <gitster@pobox.com>
Thu, 19 Oct 2017 05:45:45 +0000 (14:45 +0900)
committerJunio C Hamano <gitster@pobox.com>
Thu, 19 Oct 2017 05:45:45 +0000 (14:45 +0900)
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

1  2 
Documentation/git-filter-branch.txt
git-filter-branch.sh

@@@ -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
  -----------
@@@ -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=