Re: Rebase of the pr-msvc-support branch?

[Peter Rosin]

Den 2009-01-09 03:58 skrev Eric Blake:
> Check out Bruno Haible's git-merge-changelog, currently in the gnulib
> repository.  It handles rebasing/merging of ChangeLog entries with minimal

I don't have gnulib-tool, which is mentioned in that file, how do I get
hold of that tool (for cygwin)?

> hassle, reducing the risk of a ChangeLog merge interfering with your
> rebase from 100% down to about 2%.

Hmm, is it allowed for ChangeLog entries to not be in chronological
order? Or should I redate them when I rebase?


Den 2009-01-09 08:24 skrev Ralf Wildenhues:
> * Bob Friesenhahn wrote on Thu, Jan 08, 2009 at 09:17:37PM CET:
>> so that we can bite the bullet and integrate your branch into
>> mainline.

Go ahead, make my day!!!  :-)

> Agreed, too.  Them bullets sure taste rather bitter, though.  ;-)

Can someone pour me a pint of bitter, please? ;-)

Cheers,
Peter