aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Gernhardt <benji@silverinsanity.com>2007-08-17 19:13:04 -0400
committerJunio C Hamano <gitster@pobox.com>2007-08-17 16:32:57 -0700
commit5876b8ee3c09553912a4d033051bb25faa52ad94 (patch)
tree408e8005b74f0675d46e07b069f6ebe8a0be664d
parente63b58ba0b67262674c94321693c4f84a58ecf80 (diff)
downloadgit-5876b8ee3c09553912a4d033051bb25faa52ad94.tar.gz
git-5876b8ee3c09553912a4d033051bb25faa52ad94.tar.xz
Minor clarifications to git-filter-branch usage and doc
- Remove "DESTBRANCH" from usage, as it rewrites the branches given. - Remove an = from an example usage, as the script doesn't understand it. Signed-off-by: Brian Gernhardt <benji@silverinsanity.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/git-filter-branch.txt2
-rwxr-xr-xgit-filter-branch.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.txt
index 915258f41..8c43be611 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 c42e4512c..01900602e 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] [REV-RANGE]"
. git-sh-setup
warn () {