[PATCH 2/2] add [--] to usage of filter-branch
Signed-off-by: Andreas Heiduk <asheiduk@gmail.com>
---
Documentation/git-filter-branch.txt | 3 ++-
git-filter-branch.sh | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.txt
index 45c849d8c..1efdda804 100644
--- a/Documentation/git-filter-branch.txt
+++ b/Documentation/git-filter-branch.txt
@@ -86,7 +86,8 @@ OPTIONS
This is not a real filter executed for each commit but a one
time setup just before the loop. Therefore no commit-specific
variables are defined yet. Functions or variables defined here
- can be used or modified in the following filter steps.
+ can be used or modified in the following filter steps except
+ the commit filter, for technical reasons.
--env-filter <command>::
This filter may be used if you only need to modify the environment
diff --git a/git-filter-branch.sh b/git-filter-branch.sh
index 2758ae5eb..3a74602ef 100755
--- a/git-filter-branch.sh
+++ b/git-filter-branch.sh
@@ -87,7 +87,7 @@ USAGE="[--setup <command>] [--env-filter <command>]
[--commit-filter <command>] [--tag-name-filter <command>]
[--subdirectory-filter <directory>] [--original <namespace>]
[-d <directory>] [-f | --force]
- [<rev-list options>...]"
+ [--] [<rev-list options>...]"
OPTIONS_SPEC=
. git-sh-setup
--
2.13.0
Andreas Heiduk <asheiduk@gmail.com>