mbox series

[v3,0/3] diff: support ^! for merges

Message ID 16c49d20-cafc-4b48-3c6b-e11c74c29abb@web.de (mailing list archive)
Headers show
Series diff: support ^! for merges | expand

Message

René Scharfe Oct. 1, 2022, 10:23 a.m. UTC 
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@web.de/
[2] https://lore.kernel.org/git/29d50baa-1923-38e1-6ecb-73840376d28e@web.de/

 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