On Tue, Dec 4, 2018 at 3:10 PM Rob Landley <[email protected]> wrote: > > On 12/4/18 4:48 PM, enh via Toybox wrote: > > since rob's so responsive right now, this seems like the best > > opportunity there's ever been to stop the --help output irritating my > > OCD on a daily basis! > > > > i did choose to just ignore everything in pending for now, though. > > I'm in the process of doing the FLAG() conversion, and git isn't smart enough > for "git am" to know what to do wit the patch applies without conflict. The > file > has to be _unmodified_. Grumble.
ah, sorry... i thought you were doing that a few at a time, and committing as you go. > Sigh: git diff > xxx; git checkout -f; git am thingy.patch; patch -p1 -i xxx > > And I have to fix up su.c and cpio.c here, but your patch is in. thanks! > Rob _______________________________________________ Toybox mailing list [email protected] http://lists.landley.net/listinfo.cgi/toybox-landley.net
