From: "René Scharfe" <l.s.r@web.de>
To: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: [PATCH] revert: optionally refer to commit in the "reference" format
Date: Sun, 26 Jun 2022 11:29:35 +0200 [thread overview]
Message-ID: <6727daf1-f077-7319-187e-ab4e55de3b2d@web.de> (raw)
In-Reply-To: <xmqqsfp2b30k.fsf@gitster.g>
Am 22.05.22 um 06:32 schrieb Junio C Hamano:
> ---
> Documentation/config/revert.txt | 3 +++
> Documentation/git-revert.txt | 9 +++++++++
> builtin/revert.c | 2 ++
> sequencer.c | 32 +++++++++++++++++++++++++++-----
> sequencer.h | 1 +
> t/t3501-revert-cherry-pick.sh | 31 +++++++++++++++++++++++++++++++
> 6 files changed, 73 insertions(+), 5 deletions(-)
> create mode 100644 Documentation/config/revert.txt
>
> diff --git a/Documentation/config/revert.txt b/Documentation/config/revert.txt
> new file mode 100644
> index 0000000000..797bfb6d62
> --- /dev/null
> +++ b/Documentation/config/revert.txt
> @@ -0,0 +1,3 @@
> +revert.reference::
> + Setting this variable to true makes `git revert` to behave
> + as if the `--reference` option is given.
Shouldn't this be "were" instead of "is"? Not fully sure. Anyway:
--- >8 ---
Subject: [PATCH] revert: config documentation fixes
43966ab315 (revert: optionally refer to commit in the "reference"
format, 2022-05-26) added the documentation file config/revert.txt.
Actually include it in config.txt.
Make is used with a bare infinitive after the object; remove the "to".
Signed-off-by: René Scharfe <l.s.r@web.de>
---
Documentation/config.txt | 2 ++
Documentation/config/revert.txt | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index e284b042f2..e376d547ce 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -495,6 +495,8 @@ include::config/repack.txt[]
include::config/rerere.txt[]
+include::config/revert.txt[]
+
include::config/safe.txt[]
include::config/sendemail.txt[]
diff --git a/Documentation/config/revert.txt b/Documentation/config/revert.txt
index 797bfb6d62..802d6faca2 100644
--- a/Documentation/config/revert.txt
+++ b/Documentation/config/revert.txt
@@ -1,3 +1,3 @@
revert.reference::
- Setting this variable to true makes `git revert` to behave
+ Setting this variable to true makes `git revert` behave
as if the `--reference` option is given.
--
2.36.1
next prev parent reply other threads:[~2022-06-26 9:32 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-22 4:32 [PATCH] revert: optionally refer to commit in the "reference" format Junio C Hamano
2022-05-23 13:25 ` Johannes Schindelin
2022-05-23 22:48 ` Junio C Hamano
2022-05-27 6:01 ` [PATCH v3] " Junio C Hamano
2022-05-30 16:40 ` Johannes Schindelin
2022-05-31 14:00 ` Phillip Wood
2022-06-01 4:45 ` Junio C Hamano
2022-06-01 15:03 ` Phillip Wood
2022-06-01 15:14 ` Ævar Arnfjörð Bjarmason
2022-06-01 21:52 ` Junio C Hamano
2022-05-30 16:50 ` Side effects in Git's test suite, was Re: [PATCH] " Johannes Schindelin
2022-05-31 8:03 ` Ævar Arnfjörð Bjarmason
2022-05-23 13:45 ` Ævar Arnfjörð Bjarmason
2022-05-23 22:37 ` Junio C Hamano
2022-05-24 8:12 ` Ævar Arnfjörð Bjarmason
2022-05-24 19:11 ` Junio C Hamano
2022-05-26 11:17 ` Phillip Wood
2022-05-26 17:29 ` Junio C Hamano
2022-06-26 9:29 ` René Scharfe [this message]
2022-06-27 15:38 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6727daf1-f077-7319-187e-ab4e55de3b2d@web.de \
--to=l.s.r@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).