From: "René Scharfe" <l.s.r@web.de>
To: Git List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>,
Tim Jaacks <tim.jaacks@garz-fricke.com>,
Chris Torek <chris.torek@gmail.com>
Subject: [PATCH v3 0/3] diff: support ^! for merges
Date: Sat, 1 Oct 2022 12:23:42 +0200 [thread overview]
Message-ID: <16c49d20-cafc-4b48-3c6b-e11c74c29abb@web.de> (raw)
In-Reply-To: <ba6eea28-fb3a-b376-2529-351727c02f1a@web.de>
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
next prev parent reply other threads:[~2022-10-01 10:23 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-15 14:48 [PATCH 0/6] revision: fix order of revs for ^! René Scharfe
2022-09-15 14:51 ` [PATCH 1/6] revision: use strtol_i() for exclude_parent René Scharfe
2022-09-17 0:59 ` Chris Torek
2022-09-15 14:52 ` [PATCH 2/6] revision: factor out get_commit() René Scharfe
2022-09-15 14:52 ` [PATCH 3/6] revision: factor out add_parent() René Scharfe
2022-09-15 14:53 ` [PATCH 4/6] revision: factor out add_parents() René Scharfe
2022-09-15 14:54 ` [PATCH 5/6] revision: rename add_parents_only() to add_nth_parent() René Scharfe
2022-09-15 14:55 ` [PATCH 6/6] revision: add parents after child for ^! René Scharfe
2022-09-15 17:53 ` Junio C Hamano
2022-09-16 9:02 ` René Scharfe
2022-09-16 15:55 ` Junio C Hamano
2022-09-18 5:36 ` René Scharfe
2022-10-01 10:23 ` René Scharfe [this message]
2022-10-01 10:25 ` [PATCH v3 1/3] revision: use strtol_i() for exclude_parent René Scharfe
2022-10-01 10:26 ` [PATCH v3 2/3] revisions.txt: unspecify order of resolved parts of ^! René Scharfe
2022-10-01 10:28 ` [PATCH v3 3/3] diff: support ^! for merges René Scharfe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=16c49d20-cafc-4b48-3c6b-e11c74c29abb@web.de \
--to=l.s.r@web.de \
--cc=chris.torek@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=tim.jaacks@garz-fricke.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.