News for hackers. Stuff that matters.
Re:Advanced Git tips (slides) by ciupicri on Saturday October 09, 2010 @08:07PM (#1776239)
Wouldn't these branches be permanent? They might be fine for translations, but I doubt upstream would accept one for a bug fix.

As for bookmarks, if I understand this correctly, I have to convince upstream to use them.

With git I can create a branch in my repository and upstream can pull my changes in whatever branch it wishes too. I don't need to convince anyone to do anything else, besides accepting my patches.

Re:Advanced Git tips (slides) by tednaleid on Saturday October 09, 2010 @08:26PM (#1776274)
Sorry, I misunderstood your use case for the bug-fix branch. Yes, you likely wouldn't want a named branch for that.

I use local bookmarks for this. It lets you think of it as a branch locally (it's really a floating tag), but doesn't (automatically) get pushed out.