Advanced Git tips (slides) • Hacker News Board

Re: Advanced Git tips (slides)

#51

Post by tednaleid » Sun, Oct 10, 2010, 3:33 PM UTC

Groxx wrote: post #46

tednaleid wrote: post #43

Earlier quoted context omitted.

Clones: I have seen a number of places talk about using separate repositories for branches in mercurial, but that's not how many people work these days. Just as with git, there are less efficient ways to do things. In the article you linked to, the author is recommending against using separate cloned repositories, I agree with him. Bookmarks: As of mercurial 1.6, bookmarks aren't local only and can be pushed. Named b…

"hg push -r ." is new to me, though it makes some sense. How did you find that one out? "." is hardly a revision; it's a repository in every other command, from what I can remember (haven't used it since I initially learned mercurial). And I'll have to see how well bookmarks function - not sure what my work repo runs.

"-r" is the revision flag for the revision to push out. "." is a shortcut that just means "the revision that the working directory is at" (same as hg identify would show).

Re: Advanced Git tips (slides)

#52

Post by brodie » Sun, Oct 10, 2010, 8:29 PM UTC

kree10 wrote: post #32

yummyfajitas wrote: post #27

Earlier quoted context omitted.

There is little technical reason to choose Git over Mercurial or vice versa. Their usage is extremely similar. Git exposes a few more internals, and lets you fix mistakes more easily. For sharing branches which are incomplete, git's `rebase -i` is also somewhat superior to mercurial queues. Overall, I've found git to be marginally better than hg. The real killer feature that git has is that git talks to github and sv…

The genius thing about git-svn is not that it only "talks" to svn: using git-svn (you could say subversively) converts your repo to git. One day, when somebody suggests dumping svn for git, you can skip the "but how do we preserve all that history if we switch" conversation, because it's already done.

Mercurial's hgsubversion works just like this as well: http://mercurial.aragost.com/kick-start/hgsubversion.html

Re: Advanced Git tips (slides)

#53

Post by brettmjohnson » Mon, Oct 11, 2010, 2:09 AM UTC

JustAGeek wrote: post #36

bcl wrote: post #9

These slides are worthless without the talk. Instead go download his excellent book (or buy it) from http://progit.org

I agree that most of the slides would require further explanation but I still found a bunch of commands I've never heard of and actually could make use of, eg git bundle and git rerere. So it's not totally worthless.

Although not totally worthless, it is nearly so. It is ~350 slides, most with a single word. To find those commands you've never heard of, you have to wade through a deluge of meaningless, when out-of-context, crap. Most readers, like me, probably said "not worth the time" after about 20 slides.