{"thread":{"id":"9565","subject":"[PATCH] Minor clarifications to git-filter-branch usage and doc","startedAt":"2007-08-17T21:23:59Z","lastAt":"2007-08-17T23:33:22Z","messageCount":4,"participants":["Brian Gernhardt","Johannes Schindelin","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"50957","messageId":"20070817212359.GA14197@Hermes.local","threadId":"9565","inReplyTo":null,"subject":"[PATCH] Minor clarifications to git-filter-branch usage and doc","fromName":"Brian Gernhardt","fromEmail":"benji@silverinsanity.com","sentAt":"2007-08-17T21:23:59Z","receivedAt":"2007-08-17T21:23:59Z","isPatch":true,"sender":{"key":"benji@silverinsanity.com","avatar":"https://gravatar.com/avatar/e06c101dbc25c68114d859b4a9ec7cf8a2c52fd2b0270ef0eac0e2e63ff22311?d=mp&s=160"},"body":"- Remove \"DESTBRANCH\" from usage, as it rewrites the branches given\n- Remove an = from an example usage that the script doesn't understand\n\nSigned-off-by: Brian Gernhardt <benji@silverinsanity.com>\n---\n\n It took me way too long to figure out how to just delete a single file\n from the history.\n\n From the docs and usage it looked I needed\n $ git filter-branch --index-filter \\\n \t \"git update-index --force-remove file\" \\\n \t --tag-name-filter=cat newbranch HEAD\n\n I eventually determined the following\n $ git filter-branch --index-filter \\\n \t \"git update-index --force-remove file\" \\\n \t --tag-name-filter cat master\n\n The following changes changes the parts that led me astray, although I\n think it still could be clearer even if I don't know how to write it.\n\n Documentation/git-filter-branch.txt |    2 +-\n git-filter-branch.sh                |    2 +-\n 2 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.txt\nindex 915258f..8c43be6 100644\n--- a/Documentation/git-filter-branch.txt\n+++ b/Documentation/git-filter-branch.txt\n@@ -120,7 +120,7 @@ have all of them as parents.\n \ttag name is expected on standard output.\n +\n The original tags are not deleted, but can be overwritten;\n-use \"--tag-name-filter=cat\" to simply update the tags.  In this\n+use \"--tag-name-filter cat\" to simply update the tags.  In this\n case, be very careful and make sure you have the old tags\n backed up in case the conversion has run afoul.\n +\ndiff --git a/git-filter-branch.sh b/git-filter-branch.sh\nindex c42e451..9f10c30 100755\n--- a/git-filter-branch.sh\n+++ b/git-filter-branch.sh\n@@ -8,7 +8,7 @@\n # a new branch. You can specify a number of filters to modify the commits,\n # files and trees.\n \n-USAGE=\"git-filter-branch [-d TEMPDIR] [FILTERS] DESTBRANCH [REV-RANGE]\"\n+USAGE=\"git-filter-branch [-d TEMPDIR] [FILTERS] [BRANCHES]\"\n . git-sh-setup\n \n warn () {\n-- \n1.5.3.rc5.11.g312e\n"},{"id":"50961","messageId":"Pine.LNX.4.64.0708172252440.20400@racer.site","threadId":"9565","inReplyTo":"20070817212359.GA14197@Hermes.local","subject":"Re: [PATCH] Minor clarifications to git-filter-branch usage and doc","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2007-08-17T21:53:30Z","receivedAt":"2007-08-17T21:53:30Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Fri, 17 Aug 2007, Brian Gernhardt wrote:\n\n> -USAGE=\"git-filter-branch [-d TEMPDIR] [FILTERS] DESTBRANCH [REV-RANGE]\"\n> +USAGE=\"git-filter-branch [-d TEMPDIR] [FILTERS] [BRANCHES]\"\n\nIt is not just [BRANCHES].  Something like \"HEAD~2..HEAD\" is perfectly \nvalid, and it will rewrite only the commits in that range, leaving HEAD~2 \nand ancestors alone.\n\nCiao,\nDscho\n"},{"id":"50966","messageId":"20070817231304.GA14501@Hermes.local","threadId":"9565","inReplyTo":"Pine.LNX.4.64.0708172252440.20400@racer.site","subject":"[PATCH v2] Minor clarifications to git-filter-branch usage and doc","fromName":"Brian Gernhardt","fromEmail":"benji@silverinsanity.com","sentAt":"2007-08-17T23:13:04Z","receivedAt":"2007-08-17T23:13:04Z","isPatch":true,"sender":{"key":"benji@silverinsanity.com","avatar":"https://gravatar.com/avatar/e06c101dbc25c68114d859b4a9ec7cf8a2c52fd2b0270ef0eac0e2e63ff22311?d=mp&s=160"},"body":"- Remove \"DESTBRANCH\" from usage, as it rewrites the branches given.\n- Remove an = from an example usage, as the script doesn't understand\nit.\n\nSigned-off-by: Brian Gernhardt <benji@silverinsanity.com>\n---\n\n On Aug 17, 2007, at 5:53 PM, Johannes Schindelin wrote:\n\n > On Fri, 17 Aug 2007, Brian Gernhardt wrote:\n >  \n >> -USAGE=\"git-filter-branch [-d TEMPDIR] [FILTERS] DESTBRANCH [REV-RANGE]\"\n >> +USAGE=\"git-filter-branch [-d TEMPDIR] [FILTERS] [BRANCHES]\"\n > \n > It is not just [BRANCHES].  Something like \"HEAD~2..HEAD\" is perfectly \n > valid, and it will rewrite only the commits in that range, leaving HEAD~2 \n > and ancestors alone.\n\n Well then that should be left as REV-RANGE then, but DESTBRANCH still\n needs to leave.\n\n Documentation/git-filter-branch.txt |    2 +-\n git-filter-branch.sh                |    2 +-\n 2 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.txt\nindex 915258f..8c43be6 100644\n--- a/Documentation/git-filter-branch.txt\n+++ b/Documentation/git-filter-branch.txt\n@@ -120,7 +120,7 @@ have all of them as parents.\n \ttag name is expected on standard output.\n +\n The original tags are not deleted, but can be overwritten;\n-use \"--tag-name-filter=cat\" to simply update the tags.  In this\n+use \"--tag-name-filter cat\" to simply update the tags.  In this\n case, be very careful and make sure you have the old tags\n backed up in case the conversion has run afoul.\n +\ndiff --git a/git-filter-branch.sh b/git-filter-branch.sh\nindex c42e451..0190060 100755\n--- a/git-filter-branch.sh\n+++ b/git-filter-branch.sh\n@@ -8,7 +8,7 @@\n # a new branch. You can specify a number of filters to modify the commits,\n # files and trees.\n \n-USAGE=\"git-filter-branch [-d TEMPDIR] [FILTERS] DESTBRANCH [REV-RANGE]\"\n+USAGE=\"git-filter-branch [-d TEMPDIR] [FILTERS] [REV-RANGE]\"\n . git-sh-setup\n \n warn () {\n-- \n1.5.3.rc5.11.g312e\n"},{"id":"50967","messageId":"7vbqd5g2il.fsf@gitster.siamese.dyndns.org","threadId":"9565","inReplyTo":"20070817231304.GA14501@Hermes.local","subject":"Re: [PATCH v2] Minor clarifications to git-filter-branch usage and doc","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2007-08-17T23:33:22Z","receivedAt":"2007-08-17T23:33:22Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thanks.\n"}]}