Re: [RFC] Replace rebase with filtering

Hi,

On Mon, 15 Jan 2007, Steven Grimm wrote:

Ideally, we'd rebase the integration area against changes pulled from 
master, then each dev repository would rebase against the changes from 
the integration area. That would keep our histories nice and clean as we 
pull changes down from the external repository.

But of course rebase will get confused and we'll end up re-applying 
changes in the dev sandboxes as soon as there are any existing change in 
the integration repo when we pull changes from master, because rebase 
will turn those existing changes into new revisions that don't match any 
previously known ones in the dev repositories.

I had the impression that the use of "--ignore-if-in-upstream" in 
git-rebase avoids exactly this case: re-applying changes which are already 
in upstream.

Doesn't it work that way?

Ciao,
Dscho