From: Junio C Hamano <gitster@pobox•com>
To: "Kristoffer Haugsbakk" <kristofferhaugsbakk@fastmail•com>
Cc: "Kai Koponen" <kaikoponen@google•com>,
git@vger•kernel.org, "Elijah Newren" <newren@gmail•com>
Subject: Re: [PATCH] doc: mention rev-list --ancestry-path restrictions
Date: Wed, 04 Dec 2024 08:33:38 +0900 [thread overview]
Message-ID: <xmqqa5dc9wa5.fsf@gitster.g> (raw)
In-Reply-To: <3bf4e4bc-c807-4bbb-8920-afba077413b4@app.fastmail.com> (Kristoffer Haugsbakk's message of "Tue, 03 Dec 2024 18:38:46 +0100")
"Kristoffer Haugsbakk" <kristofferhaugsbakk@fastmail•com> writes:
> Hello Kai
>
> I couldn’t apply this patch to `master` (cc01bad4a9f (The twelfth batch,
> 2024-11-27)). It looks like it is because..
yes it is heavily whitespace damaged. Here is what I applied after
manually reconstructing.
--- >8 ---
From: Kai Koponen <kaikoponen@google•com>
Date: Tue, 3 Dec 2024 12:14:34 -0500
Subject: [PATCH] doc: mention rev-list --ancestry-path restrictions
The rev-list documentation doesn't mention that the given
commit must be in the specified commit range, leading
to unexpected results.
Signed-off-by: Kai Koponen <kaikopone@google•com>
Signed-off-by: Junio C Hamano <gitster@pobox•com>
---
Documentation/rev-list-options.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index 0d90d5b154..9d5243e0aa 100644
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -401,7 +401,8 @@ Default mode::
--ancestry-path[=<commit>]::
When given a range of commits to display (e.g. 'commit1..commit2'
- or 'commit2 {caret}commit1'), only display commits in that range
+ or 'commit2 {caret}commit1'), and a commit <commit> in that range,
+ only display commits in that range
that are ancestors of <commit>, descendants of <commit>, or
<commit> itself. If no commit is specified, use 'commit1' (the
excluded part of the range) as <commit>. Can be passed multiple
--
2.47.1-529-gecd20ec0f1
next prev parent reply other threads:[~2024-12-03 23:33 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-19 21:53 rev-list --ancestry-path with arg - bug or undocumented requirement Kai Koponen
2024-11-20 3:22 ` Elijah Newren
2024-12-02 19:45 ` Kai Koponen
2024-12-02 23:48 ` Elijah Newren
2024-12-03 1:05 ` Junio C Hamano
2024-12-03 17:14 ` [PATCH] doc: mention rev-list --ancestry-path restrictions Kai Koponen
2024-12-03 17:38 ` Kristoffer Haugsbakk
2024-12-03 17:59 ` Kai Koponen
2024-12-03 20:21 ` Kai Koponen
2024-12-03 23:33 ` Junio C Hamano [this message]
2024-12-03 23:36 ` Kai Koponen
2024-12-03 23:24 ` Junio C Hamano
-- strict thread matches above, loose matches on Subject: below --
2024-12-03 20:18 Kai Koponen via GitGitGadget
2024-12-03 22:22 ` Elijah Newren
2024-12-04 0:10 ` Junio C Hamano
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=xmqqa5dc9wa5.fsf@gitster.g \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=kaikoponen@google$(echo .)com \
--cc=kristofferhaugsbakk@fastmail$(echo .)com \
--cc=newren@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox