From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 19 Oct 2017 05:45:45 +0000 (+0900)
Subject: Merge branch 'dg/filter-branch-filter-order-doc'
X-Git-Tag: v2.15.0-rc2~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e336afdfb67384aa058eeb47687545f0492ed40c

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

e336afdfb67384aa058eeb47687545f0492ed40c
diff --cc Documentation/git-filter-branch.txt
index bebdcdec5a,394f74451a..3a52e4dce3
--- a/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 3365a3b866,b7827e745a..1b7e4b2cdb
--- a/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=