From: "Jean-Noël Avila" <jn.avila@free.fr>
To: git@vger.kernel.org
Subject: Re: [PATCH 1/3] doc: reword -B option of diff into something sensible
Date: Wed, 29 Jan 2020 13:33:25 +0100 [thread overview]
Message-ID: <24a43810-0ad7-9cd9-808b-5c7b68269a34@free.fr> (raw)
In-Reply-To: <20191212204655.10425-1-jn.avila@free.fr>
On 12/12/2019 at 21:46, Jean-Noël Avila wrote:
> The sentence seemed to miss a verb.
>
> Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
> ---
> Documentation/diff-options.txt | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
> index 09faee3b44..350d0a2fb0 100644
> --- a/Documentation/diff-options.txt
> +++ b/Documentation/diff-options.txt
> @@ -452,14 +452,14 @@ endif::git-format-patch[]
> create. This serves two purposes:
> +
> It affects the way a change that amounts to a total rewrite of a file
> -not as a series of deletion and insertion mixed together with a very
> -few lines that happen to match textually as the context, but as a
> -single deletion of everything old followed by a single insertion of
> -everything new, and the number `m` controls this aspect of the -B
> -option (defaults to 60%). `-B/70%` specifies that less than 30% of the
> -original should remain in the result for Git to consider it a total
> -rewrite (i.e. otherwise the resulting patch will be a series of
> -deletion and insertion mixed together with context lines).
> +does not appear as a series of deletion and insertion mixed together
> +with a very few lines that happen to match textually as the context,
> +but as a single deletion of everything old followed by a single
> +insertion of everything new, and the number `m` controls this aspect
> +of the -B option (defaults to 60%). `-B/70%` specifies that less than
> +30% of the original should remain in the result for Git to consider it
> +a total rewrite (i.e. otherwise the resulting patch will be a series
> +of deletion and insertion mixed together with context lines).
> +
> When used with -M, a totally-rewritten file is also considered as the
> source of a rename (usually -M only considers a file that disappeared
>
Hello,
It seems this patch was never merged, whereas the two following ones are
indeed merged. Was it refused because a complete rewrite was expected?
prev parent reply other threads:[~2020-01-29 12:33 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-12 20:46 [PATCH 1/3] doc: reword -B option of diff into something sensible Jean-Noël Avila
2019-12-12 20:46 ` [PATCH 2/3] doc: remove non pure ASCII characters Jean-Noël Avila
2019-12-13 19:53 ` Junio C Hamano
2019-12-13 21:37 ` Jean-Noël AVILA
2019-12-13 21:58 ` Junio C Hamano
2019-12-12 20:46 ` [PATCH 3/3] doc: indent multi-line items in list Jean-Noël Avila
2019-12-13 19:54 ` Junio C Hamano
2019-12-13 19:52 ` [PATCH 1/3] doc: reword -B option of diff into something sensible Junio C Hamano
2020-01-29 12:33 ` Jean-Noël Avila [this message]
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=24a43810-0ad7-9cd9-808b-5c7b68269a34@free.fr \
--to=jn.avila@free.fr \
--cc=git@vger.kernel.org \
/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).