On Jul 7, 2008, at 5:58 PM, Junio C Hamano wrote:
Junio C Hamano <gitster@xxxxxxxxx> writes:
And to answer your "git rebase --onto this from that-branch"
question, I
think ORIG_HEAD should record the tip of that-branch before rebase
takes
place, not the commit you happened to be at before running it.
Switching
branch to that-branch is not the drastic and unforseeable part. The
drastic and unforseeable change is rebasing and seeing that the
rebased
result does not work with the new upstream `from`, and the user
would want
to have a way to quickly rewind the tip of the branch back to the
state
before the rebase. The new paragraph added by this patch should
hopefully
make this reasoning more clear.
I just wanted to make sure there was a clear reasoning and to see if
someone could word it clearly, as I was getting a little cross-eyed.
-- >8 --
Documentation: update sections on naming revisions and revision ranges
Various *_HEAD pseudo refs were not documented in any central place.
Especially since we may be teaching rebase and am to record ORIG_HEAD,
it would be a good time to do so.
My only objection is to the "may". ;-)
Also, perhaps we should either list the commands that set ORIG_HEAD,
or add a note to that effect in their manpages. I'll see what wording
I can come up with, unless you (or someone else) gets to it first of
course.
While at it, reword the explanation on r1..r2 notation to reduce
confusion.
Looks good.
~~ Brian
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
