git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 1/3] doc: reword -B option of diff into something sensible

From
Jean-Noël Avila <jn.avila@free.fr>
Date
Jan 29, 2020, 12:33 UTC
Message-ID
<24a43810-0ad7-9cd9-808b-5c7b68269a34@free.fr>
In-Reply-To
<20191212204655.10425-1-jn.avila@free.fr>
On 12/12/2019 at 21:46, Jean-Noël Avila wrote:
Show 35 quoted lines
> 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?

Previous: Junio C Hamano
Message 9 of 9 in “doc: reword -B option of diff into something sensible”
  1. 1/3 doc: reword -B option of diff into something sensibleJean-Noël Avila, Dec 12, 2019
  2. 2/3 doc: remove non pure ASCII charactersJean-Noël Avila, Dec 12, 2019
  3. Junio C HamanoDec 13, 2019
  4. Jean-Noël AVILADec 13, 2019
  5. Junio C HamanoDec 13, 2019
  6. 3/3 doc: indent multi-line items in listJean-Noël Avila, Dec 12, 2019
  7. Junio C HamanoDec 13, 2019
  8. Junio C HamanoDec 13, 2019
  9. Jean-Noël AvilaJan 29, 2020

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.