Re: multi-project repos
- From
Junio C Hamano <junkio@cox.net>
- Date
- Nov 17, 2006, 17:39 UTC
- Message-ID
- <7virhem0ps.fsf@assigned-by-dhcp.cox.net>
- In-Reply-To
- <20061117162605.GA32597@spearce.org>
Shawn Pearce <spearce@spearce.org> writes:
Show 16 quoted lines
> Linus Torvalds <torvalds@osdl.org> wrote:
>> - "ORIG_HEAD" is very useful indeed, and it's the head _before_ a merge
>> (or some other operations, like "git rebase" and "git reset": think of
>> it as a "original head before we did some uncontrolled operation
>> where we otherwise can't use HEAD^ or similar")
>>
>> I use "gitk ORIG_HEAD.." a lot, and if I don't like something I see
>> when I do it, I end up doing "git reset --hard ORIG_HEAD" to undo a
>> pull I've done. This is important exactly because ORIG_HEAD is _not_
>> the same as the first parent of a merge, since a merge could have been
>> just a fast-forward.
>
> Although if you have reflog enabled on your current branch there
> is a 1 character shorter syntax:
>
> gitk HEAD@{1}..Are you sure about this? I've seen "next@{1}" to look at history of the named branch, but never history of "HEAD".