On Wed, 15 Feb 2012, Roland McGrath wrote: > But AFAICT that commit is a no-op merge. > So there's nothing that really needs to be done. And if people want to avoid merge commits, I suggest using "git pull --rebase" instead of just "git pull" when merging in other people's changes to a tree with local commits. -- Joseph S. Myers joseph@codesourcery.com