Re: `git patch-id --stable' vs quoted-printable
- From
René Scharfe <l.s.r@web.de>
- Date
- Aug 22, 2022, 15:58 UTC
- Message-ID
- <4e3edfa1-9c04-7a63-30ee-65fe6f2de62f@web.de>
- In-Reply-To
- <xmqqczcsgbvn.fsf@gitster.g>
Am 22.08.22 um 06:06 schrieb Junio C Hamano:
Show 6 quoted lines
> 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@web.de/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é
Am 22.05.22 um 06:32 schrieb Junio C Hamano:
Show 19 quoted lines
> --- > 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