git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Andreas Heiduk <asheiduk@gmail.com>
To: gitster@pobox.com, git@vger.kernel.org
Cc: Andreas Heiduk <asheiduk@gmail.com>
Subject: [PATCH 2/2] add [--] to usage of filter-branch
Date: Sat,  3 Jun 2017 12:17:55 +0200	[thread overview]
Message-ID: <20170603101755.13619-2-asheiduk@gmail.com> (raw)
In-Reply-To: <20170603101755.13619-1-asheiduk@gmail.com>

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


  reply	other threads:[~2017-06-03 10:18 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-03 10:17 [PATCH 1/2] add setup step to filter-branch Andreas Heiduk
2017-06-03 10:17 ` Andreas Heiduk [this message]
2017-06-05  8:51   ` [PATCH 2/2] add [--] to usage of filter-branch Andreas Heiduk
2017-06-09 13:14     ` Junio C Hamano
2017-06-09 14:33       ` Andreas Heiduk
2017-06-05  2:15 ` [PATCH 1/2] add setup step to filter-branch Junio C Hamano
2017-06-09  5:49   ` Jeff King
2017-06-09 13:11     ` Junio C Hamano
2017-06-10  8:54 ` [PATCH v2 " Andreas Heiduk
2017-06-10  8:54   ` [PATCH v2 2/2] add [--] to usage of filter-branch Andreas Heiduk

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170603101755.13619-2-asheiduk@gmail.com \
    --to=asheiduk@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).