From: Drew Northup <drew.northup@maine.edu>
Date: Wed, 06 Jul 2011 13:25:07 GMT
Subject: Re: [PATCH 2/2] git-rebase.txt: clarify that --abort checks out <branch>
Message-ID: <1309958707.10212.6.camel@drew-northup.unet.maine.edu>
In-Reply-To: <20110706025228.GB10015@elie>


On Tue, 2011-07-05 at 21:52 -0500, Jonathan Nieder wrote:
> Martin von Zweigbergk wrote:
> 
> > That reminds me that <branch> may not have been specified. How about
> > saying things more explicitly like this?
> >
> >   Abort the rebase operation and reset HEAD to the original branch. If
> >   <branch> was provided when the rebase operation was started, then
> >   HEAD will be reset to <branch>. Otherwise HEAD will be reset to
> >   where it was when the rebase operation was started.
> 
> Sounds great to me for what it's worth.  (With the caveat that "git
> rebase --abort" reattaches HEAD in addition to what "git reset --hard"
> would do, but I think it's fine to just leave that implied.)

Agreed, that is better.

-- 
-Drew Northup
________________________________________________
"As opposed to vegetable or mineral error?"
-John Pescatore, SANS NewsBites Vol. 12 Num. 59