Changes between v1 [1] and v2 [2]: - Single patch, local fix, leave revision.c alone. Changes since v2 [2]: - Patch 1 (unrelated cleanup) is back, requested by Chris. - New patch 2 to remove a broken promise from documentation. - Move the first_non_parent tracking code to after add_object_array() and add a comment, both to (hopefully) improve readability. - Mention ^! in the documentation of git diff. revision: use strtol_i() for exclude_parent revisions.txt: unspecify order of resolved parts of ^! diff: support ^! for merges [1] https://lore.kernel.org/git/ba6eea28-fb3a-b376-2529-351727c02f1a@xxxxxx/ [2] https://lore.kernel.org/git/29d50baa-1923-38e1-6ecb-73840376d28e@xxxxxx/ Documentation/git-diff.txt | 8 ++++---- Documentation/revisions.txt | 2 +- builtin/diff.c | 23 ++++++++++++++++++----- revision.c | 5 ++--- t/t4038-diff-combined.sh | 10 ++++++++++ 5 files changed, 35 insertions(+), 13 deletions(-) -- 2.37.3
