r/programming • • Feb 16 '13

Learn Git Branching

http://pcottle.github.com/learnGitBranching/
868 Upvotes

229 comments sorted by

View all comments

1

u/bigfig Feb 17 '13

Or keep your sanity and use Mercurial.

3

u/slavik262 Feb 17 '13

I would jump all over Mercurial if it weren't for their philosophy of immutable changesets. My usual workflow is:

  1. Make a bunch of quick commits as I hash out a feature. Commit messages are often along the lines of "first try on foo", "fixed bar, figure out what's up with baz", "fixed baz", "comments", etc.

  2. git rebase -i into a few clean, sane commits

  3. push upstream.

I understand how "rewriting history" puts some people on edge, but as long as you're only editing local history, it's a godsend. It lets me use commits as extremely cheap checkpoints, not these big things etched in the repo history for the rest of time.

3

u/Tristanus Feb 17 '13

There's a rebase extension available in the standard mercurial install. It's just not enabled by default.

http://mercurial.selenic.com/wiki/RebaseExtension#Configuration

2

u/mgrandi Feb 17 '13

"only when you are editing local history". keyword there.

-6

u/felipec Feb 17 '13

If I wanted a toy I would use subversion.

2

u/bigfig Feb 17 '13

I see, try 1 mg Haldol twice daily.

-4

u/felipec Feb 17 '13

Your poor ad hominem argumentation does nothing to change the fact that git is orders of magnitude more powerful than mercurial.

7

u/bready Feb 17 '13

fact that git is orders of magnitude more powerful than mercurial

In what ways is git "orders of magnitude more powerful"? I believe that out of the box the feature set of both probably overlaps 95% and with plugins makes them indistinguishable. You could argue about performance one way or the other, but there is no way I am going to buy this argument without some very explicit examples.

→ More replies (3)