I would stick to having merge commits, because they more fully capture the work that took place.
On Sun, Aug 21, 2011 at 10:41 PM, PJ Weisberg <[email protected]> wrote: > There's nothing necessarily wrong with merge commits, but if you want to > straighten out your history before you push: > > $ git fetch origin > $ git rebase origin/branch > This approach, while it will work the vast majority of the time, will potentially break things without you knowing about it, and it's not obvious how. There's a brief write-up explaining it at http://aprescott.com/posts/git-rebase-landmines -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
