Re: several quick questions

From: Kenneth Johansson <ken@canit.se>
Date: Feb 14, 2006, 17:47 UTC
Message-ID: <pan.2006.02.14.17.47.53.126690@canit.se>
In-Reply-To: <Pine.LNX.4.64.0602140845080.3691@g5.osdl.org>

On Tue, 14 Feb 2006 09:05:16 -0800, Linus Torvalds wrote:

Show 21 quoted lines

> 
> 
> On Tue, 14 Feb 2006, Nicolas Vilz 'niv' wrote:
>> 
>> i wonder, how i revoke a straight forward merge of two trees... I
>> actually wanted to be look like somewhere in the git-repository, where
>> some branches are merged back with the master tree, but i think, that
>> wasn't "cg-merge -c <tree to merge with the actual one>"...
>> 
>> my result was that my master tree has now the same sha1-sum as my
>> development-tree and gitk visualisation differs from that what i saw in
>> the git-repository. (Several Arrows headed into back into one line...)
>> 
>> maybe that was because i didn't do anything in my master tree in the
>> meantime.
>> 
>> And another thing, is there no posibility to get back to some commits or
>> tags? I realized you can rebranch tags... what, if i want to switch back
>> to git version 1.1.6 in the git repository? Or a certain commit?
> 
> Both of these can be solved with "git reset".

I also had this exact question today since I wanted to compile an earlier version of the kernel and like Nicolas I naturally got stuck on the checkout command and that dose not work like one would think.

What I ended up doing was going nee deep into the plumbing.

first doing cat on the tag in .git/refs/tags/ taking the output as an argument to "git-read-tree" followed by "git-update-index --replace" and "git-checkout-index -a -f -u"

I'm not sure that many people will understand that they want git-reset for this just reading the man pages.