[Haifux] Git Lecture discussion

Ohad Lutzky ohad at lutzky.net
Tue Feb 5 01:41:59 IST 2008

I hope my lecture was bearable :)

Regarding keyword substituion: It turns out that Linus thinks it's a
horrible idea: http://kerneltrap.org/mailarchive/git/2006/10/9/223932
(This has the unfortunate consequence of making several of the attendees
ugly. Sorry everybody ;) ). It turns out I did something very similar
on a whim (not having known keyword substitution beforehand) --- I've
created a "make a tarball of this revision" script, which tags it
appropriately (in a place appropriate to the application) according to
the tag I've selected.

Regarding rebasing: Indeed, it is only meant to be used when developing
a private branch, and later submitting using git format-patch. (These
patches are later applied using git am, and merging/rebasing works
properly, leaving no duplicate commits). When working on a public topic
branch, rebasing will cause problems for anyone pulling from the
repository, so it's best to resort to ordinary merging. As patches
usually don't need to be formatted for this usage, this isn't a big
price to pay.

There were several other issues explored which I couldn't answer
properly... can anyone please remind me?

Thank you all for coming!
Man is the only animal that laughs and weeps, for he is the only animal that is struck with the difference between what things are and what they ought to be.
 - William Hazlitt

More information about the Haifux mailing list