[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: "git pull -r" to avoid merge commits
From: |
David Kastrup |
Subject: |
Re: "git pull -r" to avoid merge commits |
Date: |
Sun, 01 Jun 2014 07:04:53 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.4.50 (gnu/linux) |
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