Merge branch 'js/submodule-in-excluded' into maint

diff --git a/git-filter-branch.sh b/git-filter-branch.sh
index 3365a3b866b510db5bf9ca20a0341c34c21b7a69..1b7e4b2cdbdf36e090c4b1f531dcc48222d8f8b1 100755 (executable)
--- 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/" : '\(.*[^/]\)/*$')/
                ;;