Felipe Contreras wrote:
> Yes, I see how xx/topic~4 would be useful in the instruction sheet, I
> just didn't see it would be useful to generate that from an existing
> integration branch. After the explanation above I see how it could be
> useful to some people (though not all). I'll implement tha
Junio C Hamano wrote:
> I presume that the workflow can be mimicked by having another branch
> 'match-next' and building it on top of 'master', and then building
> 'jch' on top of it, and then building 'pu' on top of it. Then you
> should be able to play 'match-next' instruction on top of 'next'
>
On Tue, May 20, 2014 at 5:47 PM, Junio C Hamano wrote:
> Felipe Contreras writes:
>
>> I'm not sure what would be the usefulness of using things like
>> 'xx/topic~4'.
>
> As a notation it is not very pretty ;-).
>
> Imagine that xx/topic is about a multistep introduction of a
> backward incompati
Felipe Contreras writes:
> I'm not sure what would be the usefulness of using things like
> 'xx/topic~4'.
As a notation it is not very pretty ;-).
Imagine that xx/topic is about a multistep introduction of a
backward incompatible feature. The beginning part of the series up
to xx/topic~4 are t
Junio C Hamano wrote:
> Felipe Contreras writes:
>
> > Or have an option to specify a dynamic instruction sheet, so you can cat
> > the instructions of 'match-next' and replace the base. However, I don't
> > see the point of re-applying the branches for 'next' if you already know
> > that 'next'
Felipe Contreras writes:
> Or have an option to specify a dynamic instruction sheet, so you can cat
> the instructions of 'match-next' and replace the base. However, I don't
> see the point of re-applying the branches for 'next' if you already know
> that 'next' and 'match-next' are the same.
Th
Junio C Hamano wrote:
> Felipe Contreras writes:
>
> > ...
> > Which will generate the integration instructions for you:
> >
> > % git reintegrate --cat
> > base master
> > merge jl/submodule-mv
> >
> > Moving a regular file in a repository with a .gitmodules file was
> > producing
Felipe Contreras writes:
> ...
> Which will generate the integration instructions for you:
>
> % git reintegrate --cat
> base master
> merge jl/submodule-mv
>
> Moving a regular file in a repository with a .gitmodules file was
> producing a warning 'Could not find section in .gitmod
Hi,
git reintegrate is a helper tool to manage integration branches, it
has all the options of other known tools.
This is a rewrite of John Keeping's git-integration in Ruby, it has
essentially the same features and passes all the git-integration
tests, but it has more features.
One feature that
9 matches
Mail list logo
