Am 22.08.22 um 06:06 schrieb Junio C Hamano: > René, do you remember if you used diff.suppressBlankEmpty > configuration when generating the patch in question at: > > https://public-inbox.org/git/6727daf1-f077-7319-187e-ab4e55de3b2d@xxxxxx/raw > > by the way? I did not use that option. Attached the copy from my Sent folder, which has spaces at the start of the blank lines in the config.txt hunk. René
--- Begin Message ---
- Subject: Re: [PATCH] revert: optionally refer to commit in the "reference" format
- From: René Scharfe <l.s.r@xxxxxx>
- Date: Sun, 26 Jun 2022 11:29:35 +0200
- In-reply-to: <xmqqsfp2b30k.fsf@gitster.g>
- References: <xmqqsfp2b30k.fsf@gitster.g>
- User-agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0) Gecko/20100101 Thunderbird/91.10.0
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@xxxxxx> --- 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
--- End Message ---
