On Sunday, August 21, 2011 11:41:50 PM UTC+2, Peter J Weisberg 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 > > You can also do it in one command like this:
$ git pull --rebase We try to avoid merge-commits because we think history looks tidier that way. So we do the above quite a lot. -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To view this discussion on the web visit https://groups.google.com/d/msg/git-users/-/-RCuCQrq0bMJ. 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.
