From: Ian Campbell <ijc@hellion.org.uk>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Michele Locati" <michele@locati.it>
Cc: git@vger.kernel.org
Subject: Re: How to use filter-branch with --state-branch?
Date: Thu, 08 Mar 2018 09:40:26 +0000 [thread overview]
Message-ID: <1520502026.23648.29.camel@hellion.org.uk> (raw)
In-Reply-To: <87zi3inckw.fsf@evledraar.gmail.com>
On Thu, 2018-03-08 at 10:25 +0100, Ævar Arnfjörð Bjarmason wrote:
> > The first filter-branch call required 7168 steps, so did the second call...
> > I also tried without the --prune option of remote update (I had to add
> > --force to the second filter-branch), but nothing changed.
You can see an example of the usage in:
https://git.kernel.org/pub/scm/linux/kernel/git/devicetree/devicetree-rebasing.git/
in the `scripts/` sub dir (flow is `cronjob` → `filter.sh` → `git
filter-branch...`.
I think the big difference is rather than `--all` you need to give it
the `previous..now` range since that is the update you wish to do
(first time around you just give it `now`).
The devicetree-rebasing scripting arranges that by keeping the previous
in a separate branch.
Ian.
next prev parent reply other threads:[~2018-03-08 10:17 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-06 15:17 How to use filter-branch with --state-branch? Michele Locati
2018-03-08 9:25 ` Ævar Arnfjörð Bjarmason
2018-03-08 9:40 ` Ian Campbell [this message]
2018-03-09 13:04 ` Michele Locati
2018-03-09 13:23 ` Ian Campbell
2018-03-09 17:17 ` Michele Locati
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=1520502026.23648.29.camel@hellion.org.uk \
--to=ijc@hellion.org.uk \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=michele@locati.it \
/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).