Let me see if I could just fix up this series on top like this. Failing this, I'll break it down and resend in small chunks. This redoes a85e5a0108 (parse-options: allow keep-unknown + stop-at-non-opt combination - 2019-01-17), deletes dead functions and rewrites b9b760ed1c (diff.c: convert -B|--break-rewrites - 2019-01-17) a bit. Nguyễn Thái Ngọc Duy (3): Revert "parse-options: allow keep-unknown + stop-at-non-opt combination" diff.c: delete unused functions diff.c: simplify diff_opt_break_rewrites() diff.c | 74 ++----------------------------------------------- parse-options.c | 4 +++ 2 files changed, 6 insertions(+), 72 deletions(-) -- 2.20.1.560.g70ca8b83ee