A wrong commit

[Carlos O'Donell]

On Wed, Feb 15, 2012 at 7:21 PM, Joseph S. Myers
<joseph@codesourcery.com> wrote:
> 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.

That's what I use.

e.g.
...
git stash
git pull --rebase
git stash apply
...

I also don't care about seeing no-op merge commits.

Cheers,
Carlos.