This is what recent versions of GitHub for Windows does by default. There are de...

anaisbetts on April 30, 2013 | parent | context | favorite | on: Git pull --rebase until it hurts

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.

32bitkid on April 30, 2013 [–]

or cherry-picking features across version branches.