On 08/31/2012 03:57 PM, Jim Meyering wrote: > Stefano Lattarini wrote: > >> On 08/31/2012 03:34 PM, Jim Meyering wrote: >>> Stefano Lattarini wrote: >>>> These should go on the top of my other pending series "[PATCH 0/7] Minor >>>> cleanup and refactoring": >>>> >>>> <http://lists.gnu.org/archive/html/coreutils/2012-08/msg00205.html> >>> >>> Thanks! Looking at these now. >>> FYI, I pushed that other series an hour ago. >>> >> Ouch, some of them still have the S-o-B line! Can you delete those, or >> should I resend? > > No problem. As I tried to apply them with "git am FILE", > the new commit hook complained and left me in the editor, > where I removed them. > > However, 3/6 failed to apply. > Are you applying with "git am -3", right? Otherwise, merge conflicts that can be solved automatically won't be.
Anyway, I can resend the series (now rebased on latest master) if that would make things easier .... > It took a little effort to make it apply, so I'm attaching below > what I am now looking at. FYI, I've just confirmed it passed "make check" > but not "make syntax-check". Regards, Stefano
