From: Brian Gernhardt <benji@silverinsanity.com>
To: git@vger.kernel.org
Subject: [PATCH] Minor clarifications to git-filter-branch usage and doc
Date: Fri, 17 Aug 2007 17:23:59 -0400 [thread overview]
Message-ID: <20070817212359.GA14197@Hermes.local> (raw)
- Remove "DESTBRANCH" from usage, as it rewrites the branches given
- Remove an = from an example usage that the script doesn't understand
Signed-off-by: Brian Gernhardt <benji@silverinsanity.com>
---
It took me way too long to figure out how to just delete a single file
from the history.
From the docs and usage it looked I needed
$ git filter-branch --index-filter \
"git update-index --force-remove file" \
--tag-name-filter=cat newbranch HEAD
I eventually determined the following
$ git filter-branch --index-filter \
"git update-index --force-remove file" \
--tag-name-filter cat master
The following changes changes the parts that led me astray, although I
think it still could be clearer even if I don't know how to write it.
Documentation/git-filter-branch.txt | 2 +-
git-filter-branch.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.txt
index 915258f..8c43be6 100644
--- a/Documentation/git-filter-branch.txt
+++ b/Documentation/git-filter-branch.txt
@@ -120,7 +120,7 @@ have all of them as parents.
tag name is expected on standard output.
+
The original tags are not deleted, but can be overwritten;
-use "--tag-name-filter=cat" to simply update the tags. In this
+use "--tag-name-filter cat" to simply update the tags. In this
case, be very careful and make sure you have the old tags
backed up in case the conversion has run afoul.
+
diff --git a/git-filter-branch.sh b/git-filter-branch.sh
index c42e451..9f10c30 100755
--- a/git-filter-branch.sh
+++ b/git-filter-branch.sh
@@ -8,7 +8,7 @@
# a new branch. You can specify a number of filters to modify the commits,
# files and trees.
-USAGE="git-filter-branch [-d TEMPDIR] [FILTERS] DESTBRANCH [REV-RANGE]"
+USAGE="git-filter-branch [-d TEMPDIR] [FILTERS] [BRANCHES]"
. git-sh-setup
warn () {
--
1.5.3.rc5.11.g312e
next reply other threads:[~2007-08-17 21:24 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-17 21:23 Brian Gernhardt [this message]
2007-08-17 21:53 ` [PATCH] Minor clarifications to git-filter-branch usage and doc Johannes Schindelin
2007-08-17 23:13 ` [PATCH v2] " Brian Gernhardt
2007-08-17 23:33 ` Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070817212359.GA14197@Hermes.local \
--to=benji@silverinsanity.com \
--cc=git@vger.kernel.org \
/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.
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 NNTP newsgroup(s).