Re: Conduit GIT

[John Carr <john carr unrouted co uk>]

On Wed, Apr 8, 2009 at 10:34 PM, John Stowers <john stowers gmail com> wrote:
>
>
> On Wed, Apr 8, 2009 at 11:05 PM, John Carr <john carr unrouted co uk> wrote:
>>
>> I've rebased my syncml branch against the new Git conversion. See:
>
> How?
>
> git rebase --onto ?
>
> John
>
>>
>>
>> http://github.com/Jc2k/conduit/tree/
>>
>> Theres a copy of master for github users to fork, and the syncml
>> goodness is in the syncml branch.
>>
>> I pinged gnome-18n about the change, and ohloh is updating as we speak.
>>
>> John
>>
>> On Tue, Apr 7, 2009 at 10:56 PM, John Stowers <john stowers gmail com>
>> wrote:
>> > Hi All,
>> >
>> > Thanks to Jc2k, Conduit is now hosted in GIT. Please update your work
>> > accordingly.
>> >
>> > http://git.gnome.org/cgit/conduit/
>> >
>> > Thanks
>> >
>> > John
>> >

You expect too much of git :) There are some things you can try if you
look at the git-rebase manpage for "recovering from an upstream
rebase", but i opted for a poor mans rebase - see:

http://blogs.gnome.org/bratsche/2009/04/03/moving-history-between-git-repos/

John