diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-10-19 05:45:45 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-10-19 05:45:45 (GMT) |
| commit | e336afdfb67384aa058eeb47687545f0492ed40c (patch) | |
| tree | a417db3628b605e716b54cf2e0a01d5a00d7622b /git-filter-branch.sh | |
| parent | 39a2aeacc5c606b6b9a4c5b8397b02c35c38ae5f (diff) | |
| parent | 07c4984508865984fdfdedf2e1cdf86328221af4 (diff) | |
| download | git-e336afdfb67384aa058eeb47687545f0492ed40c.zip git-e336afdfb67384aa058eeb47687545f0492ed40c.tar.gz git-e336afdfb67384aa058eeb47687545f0492ed40c.tar.bz2 | |
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
Diffstat (limited to 'git-filter-branch.sh')
| -rwxr-xr-x | git-filter-branch.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/git-filter-branch.sh b/git-filter-branch.sh index 3365a3b..1b7e4b2 100755 --- a/git-filter-branch.sh +++ b/git-filter-branch.sh @@ -81,11 +81,11 @@ 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>] - [--subdirectory-filter <directory>] [--original <namespace>] + [--original <namespace>] [-d <directory>] [-f | --force] [--state-branch <branch>] [--] [<rev-list options>...]" @@ -154,6 +154,10 @@ do --setup) filter_setup="$OPTARG" ;; + --subdirectory-filter) + filter_subdir="$OPTARG" + remap_to_ancestor=t + ;; --env-filter) filter_env="$OPTARG" ;; @@ -175,10 +179,6 @@ do --tag-name-filter) filter_tag_name="$OPTARG" ;; - --subdirectory-filter) - filter_subdir="$OPTARG" - remap_to_ancestor=t - ;; --original) orig_namespace=$(expr "$OPTARG/" : '\(.*[^/]\)/*$')/ ;; |