Re: Understanding a recent commit in emacs-25 branch [ed19f2]

[John Wiegley]

>>>>> Paul Eggert <address@hidden> writes:

> Rebasing makes sense for Alan's use case. He was working on the fix anyway,
> so retesting was not that big a deal for him. Conversely, he's more of an
> Emacs expert than a Git expert and merge conflicts are more of an hassle for
> him. This particular case did not benefit much from the advantages of
> merging over rebasing; quite the contrary.

I agree that when working on a focused change, like a bug fix, that rebasing
is much more preferable, as it avoids these unnecessary merge commits.

However, we can't reasonably make this a requirement, because Git makes it
very different to "get things right", nor do you always want rebasing if your
feature work is longer than an easily retested commit-or-two.

-- 
John Wiegley                  GPG fingerprint = 4710 CF98 AF9B 327B B80F
http://newartisans.com                          60E1 46C4 BD1A 7AC1 4BA2