Re: [git-users] Cherry picking fails for obscure reasons

2014-08-27 Thread Philip Oakley
From: Torsten Bronger To: git-users@googlegroups.com Cc: philipoak...@iee.org Sent: Wednesday, August 27, 2014 7:52 AM Subject: Re: [git-users] Cherry picking fails for obscure reasons Hallöchen! Am Mittwoch, 27. August 2014 08:34:54 UTC+2 schrieb Philip Oakley:  From

Re: [git-users] Cherry picking fails for obscure reasons

2014-08-26 Thread Torsten Bronger
Hallöchen! Am Mittwoch, 27. August 2014 08:34:54 UTC+2 schrieb Philip Oakley: > >  > *From:* Torsten Bronger > > *To:* git-...@googlegroups.com > *Cc:* philip...@iee.org > *Sent:* Wednesday, August 27, 2014 6:23 AM > *Subject:* Re: [git-users] Cherry picking f

Re: [git-users] Cherry picking fails for obscure reasons

2014-08-26 Thread Philip Oakley
From: Torsten Bronger To: git-users@googlegroups.com Cc: philipoak...@iee.org Sent: Wednesday, August 27, 2014 6:23 AM Subject: Re: [git-users] Cherry picking fails for obscure reasons Am Dienstag, 26. August 2014 20:38:56 UTC+2 schrieb Philip Oakley:  - Original

Re: [git-users] Cherry picking fails for obscure reasons

2014-08-26 Thread Torsten Bronger
Am Dienstag, 26. August 2014 20:38:56 UTC+2 schrieb Philip Oakley: > >  > - Original Message - > > *From:* Torsten Bronger > *To:* git-...@googlegroups.com > *Sent:* Friday, August 22, 2014 12:24 PM > *Subject:* [git-users] Cherry picking fails for obscure reasons > > The two branc

Re: [git-users] Cherry picking fails for obscure reasons

2014-08-26 Thread Philip Oakley
- Original Message - From: Torsten Bronger To: git-users@googlegroups.com Sent: Friday, August 22, 2014 12:24 PM Subject: [git-users] Cherry picking fails for obscure reasons Hallöchen! I try to merge two repos, yielding a flat (aka interleaved) history. I do this along