This implements --pickaxe-raw-diff as explained in 2/2. I based this on "next" because Duy's in-flight diff option refactoring would have conflicted with it. Ævar Arnfjörð Bjarmason (2): diffcore-pickaxe: refactor !one or !two case in diff_grep diffcore-pickaxe: add --pickaxe-raw-diff for use with -G Documentation/diff-options.txt | 17 ++++++++++++ diff.c | 3 +++ diff.h | 2 ++ diffcore-pickaxe.c | 48 +++++++++++++++++++++++++++------- t/t4013-diff-various.sh | 1 + t/t4209-log-pickaxe.sh | 45 +++++++++++++++++++++++++++++++ 6 files changed, 107 insertions(+), 9 deletions(-) -- 2.21.0.593.g511ec345e18
