Re: Rebasing with submodule change causes red herring with --continue

2015-04-27 Thread Robert Dailey
On Thu, Apr 23, 2015 at 5:43 PM, John Keeping wrote: > On Thu, Apr 23, 2015 at 09:35:38PM +0100, John Keeping wrote: >> On Thu, Apr 23, 2015 at 09:43:44PM +0200, Jens Lehmann wrote: >> > Am 23.04.2015 um 21:07 schrieb Robert Dailey: >> > > On Thu, Apr 23, 2015 at 1:17 PM, Robert Dailey >> > > wr

Re: Rebasing with submodule change causes red herring with --continue

2015-04-23 Thread John Keeping
On Thu, Apr 23, 2015 at 09:35:38PM +0100, John Keeping wrote: > On Thu, Apr 23, 2015 at 09:43:44PM +0200, Jens Lehmann wrote: > > Am 23.04.2015 um 21:07 schrieb Robert Dailey: > > > On Thu, Apr 23, 2015 at 1:17 PM, Robert Dailey > > > wrote: > > >> On Fri, Apr 10, 2015 at 11:44 AM, John Keeping

Re: Rebasing with submodule change causes red herring with --continue

2015-04-23 Thread John Keeping
On Thu, Apr 23, 2015 at 09:43:44PM +0200, Jens Lehmann wrote: > Am 23.04.2015 um 21:07 schrieb Robert Dailey: > > On Thu, Apr 23, 2015 at 1:17 PM, Robert Dailey > > wrote: > >> On Fri, Apr 10, 2015 at 11:44 AM, John Keeping wrote: > >>> On Fri, Apr 10, 2015 at 11:30:20AM -0500, Robert Dailey wro

Re: Rebasing with submodule change causes red herring with --continue

2015-04-23 Thread Jens Lehmann
Am 23.04.2015 um 21:07 schrieb Robert Dailey: On Thu, Apr 23, 2015 at 1:17 PM, Robert Dailey wrote: On Fri, Apr 10, 2015 at 11:44 AM, John Keeping wrote: On Fri, Apr 10, 2015 at 11:30:20AM -0500, Robert Dailey wrote: I have a branch that contains a commit with a single change: A submodule po

Re: Rebasing with submodule change causes red herring with --continue

2015-04-23 Thread Robert Dailey
On Thu, Apr 23, 2015 at 1:17 PM, Robert Dailey wrote: > On Fri, Apr 10, 2015 at 11:44 AM, John Keeping wrote: >> On Fri, Apr 10, 2015 at 11:30:20AM -0500, Robert Dailey wrote: >>> I have a branch that contains a commit with a single change: A >>> submodule pointing to a new SHA1. >>> >>> When I r

Re: Rebasing with submodule change causes red herring with --continue

2015-04-23 Thread Robert Dailey
On Fri, Apr 10, 2015 at 11:44 AM, John Keeping wrote: > On Fri, Apr 10, 2015 at 11:30:20AM -0500, Robert Dailey wrote: >> I have a branch that contains a commit with a single change: A >> submodule pointing to a new SHA1. >> >> When I rebase this branch onto the tip of its parent branch AND that >