Re: "git pull -r" to avoid merge commits

[David Kastrup]

Eric Hanchrow <address@hidden> writes:

>> Why would you need to avoid merge commits?  If they confuse the admin
>> scripts, then perhaps fixing those scripts is a better way.
>
> Merge commits confuse humans.  If someone's contribution is just one
> or two commits, then the history is much easier to understand if they
> rebase instead of merging.
>
> Merges make sense, though, when the new work is a long series of commits.

The length of the series is marginal.  What makes a difference is
parallel ongoing work in both branches touching the same files.  In that
case, disentangling the intertwined histories may be more expensive than
it is worth.

-- 
David Kastrup