News for hackers. Stuff that matters.
Re:Git pull --rebase until it hurts by xpaulbettsx on Tuesday April 30, 2013 @08:12AM (#5631647)
This is what recent versions of GitHub for Windows does by default. There are definitely advantages to merge commits, the biggest one being that force-undoing an unwanted merge commit is as straightforward as resetting to the first parent of the merge commit.
Re:Git pull --rebase until it hurts by 32bitkid on Tuesday April 30, 2013 @08:56AM (#5631843)
or cherry-picking features across version branches.