On 03/21/2016 05:17 PM, Paul Eggert wrote:
> (I did not look for similar clumps yet.)

I looked for similar clumps of errors (i.e., patches lost by incorrect 
merges to master), and found two as noted below. I suspect gitmerge.el 
somehow encourages these errors, but haven't looked into how that might 
be. In the meantime I suggest looking skeptically at anything gitmerge 
does where the log message looks like "The following commit was skipped: 
... Merge branch 'A' ... into B", as skipping a merge ought to be a big 
deal.

I installed the attached patches to attempt to resurrect the two lost 
master patches.

Here are logs for the merges that lost patches:


commit 5ab243f40e4db91586ff74b01a775a5218a1d5be
Merge: f991a50 52f64cc
Author: John Wiegley <johnw@newartisans.com>
Date:   Thu Mar 3 23:53:26 2016 -0800

     ; Merge from origin/emacs-25

     The following commit was skipped:

     52f64cc Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs 
into emacs-25

This lost commit 433407d8230a8a256b26c6c7615d3921b43f59ce.



commit c71e7cc113ed0d5f01aaa2e441a3e3c9fbeb9fa5
Merge: f55fc92 1fbcc8a
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Tue Feb 9 14:23:10 2016 -0800

     ; Merge from origin/emacs-25

     The following commit was skipped:

     1fbcc8a Merge branch 'emacs-25' of 
git.savannah.gnu.org:/srv/git/emacs into emacs-25

This lost commit c1d32a65372c72d7de4808d620eefd3214a8e92a.