Quotes of the week

[Posted December 22, 2010 by corbet]

Branches thus become trees of trees. To visualise this, it's simplest to think of the state of your repository as a point in a high-dimensional 'code-space', in which branches are represented as n-dimensional membranes, mapping the spatial loci of successive commits onto the projected manifold of each cloned repository.

-- Jonathan Hartley; who says git is complicated?

Happily, I noticed, and did a "git reset --hard @{1}" to get things back, but at no point did "git am" warn about the implicit "reset" it did, that threw away non-am state.

-- Linus Torvalds almost loses his high-dimensional code-space

Quotes of the week

Posted Dec 24, 2010 16:26 UTC (Fri) by kleptog (subscriber, #1183) [Link] (4 responses)

Jonathan Hartley may have been joking, but this is kind of the way I think about how git works. Except your space is actually weirdly compacted because each point is represented by a SHA hash. If it ever happens that two different projects end up with a hash collision I imagine the universe will implode.

The only problem I have is that since commits are simply links between two "points" I imagine it should be easy to shuffle commits around, to merge and split them. But that just doesn't seem to be that simple (or I haven't found the right tool).

Anyway, "git rebase" is cool. Just had to say that. :)

Quotes of the week

Posted Dec 24, 2010 19:03 UTC (Fri) by jthill (subscriber, #56558) [Link]

How would a duplicate hash in different projects cause trouble?

For history editing look at cherry-pick and reset --merge and rebase -i. If you use reset --merge to build clean presentation-quality branches without uninteresting safeties and mistakes, and then delete the noisy branches once all is good, not only is your repository a manifold but full quantum reality, virtual particles, foam and all! (I'm neither mathematician nor physicist so ttmv)

Quotes of the week

Posted Dec 24, 2010 20:23 UTC (Fri) by rvfh (guest, #31018) [Link] (2 responses)

I personally use git rebase -i <hash>. Isn't it what you're after?

Quotes of the week

Posted Jan 1, 2011 14:25 UTC (Sat) by kleptog (subscriber, #1183) [Link] (1 responses)

I played with this during the week and it does seem pretty close. I've got to get used to the edit mode, but it's quite cool.

Quotes of the week

Posted Jan 3, 2011 9:31 UTC (Mon) by johill (subscriber, #25196) [Link]

What do you mean by the "edit mode"? It just invokes $EDITOR afaik?