From: Drew Northup Date: Mon, 14 Mar 2011 11:40:32 GMT Subject: Re: [PATCH] Clarify: rebase abort leaves checked-out Message-ID: <1300102832.5129.17.camel@drew-northup.unet.maine.edu> In-Reply-To: <7vtyf6hkpo.fsf@alter.siamese.dyndns.org> On Sun, 2011-03-13 at 12:41 -0700, Junio C Hamano wrote: > Drew Northup writes: > > > -The latter form is just a short-hand of `git checkout topic` > > -followed by `git rebase master`. > > +*NOTE:* The latter form is just a short-hand of `git checkout topic` > > +followed by `git rebase master`. If the rebase is aborted `topic` will > > +remain the checked-out branch. > > The behaviour is consistent between the case where "this on that" form > succeeds and it stops and gets aborted, and I think both are euqally > noteworthy. So I'd suggest dropping "if aborted". So a synthetic look at that might be: -If the rebase is aborted +When rebase exits Comments? I'll see about re-rolling likewise (and on something with a more recent runtime!). -- -Drew Northup ________________________________________________ "As opposed to vegetable or mineral error?" -John Pescatore, SANS NewsBites Vol. 12 Num. 59