From: Matthieu Moy <Matthieu.Moy@imag.fr>
To: git@vger.kernel.org, gitster@pobox.com
Cc: Matthieu Moy <Matthieu.Moy@imag.fr>
Subject: [RFC/PATCH] Document -B<n>[/<m>], -M<n> and -C<n> variants of -B, -M and -C
Date: Wed, 28 Jul 2010 11:43:59 +0200 [thread overview]
Message-ID: <1280310239-16897-1-git-send-email-Matthieu.Moy@imag.fr> (raw)
These options take an optional argument, but this optional argument was
not documented.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
---
I'm not really happy with my description of -Bn/m, which I essentially
took from eeaa46031479 (Junio, Jun 3 2005, diff: Update -B
heuristics). Someone with better understanding of how it works can
probably propose something better.
Documentation/diff-options.txt | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 2371262..d07809c 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -206,10 +206,18 @@ endif::git-format-patch[]
the diff-patch output format. Non default number of
digits can be specified with `--abbrev=<n>`.
--B::
+-B[<n>]::
+-B<n>/<m>::
Break complete rewrite changes into pairs of delete and create.
-
--M::
+ If `n` is specified, it gives the threshold (as a percentage
+ of changed lines) above which a change is considered as
+ complete rewrite. For example, `-B90%` means git will detect a
+ rewrite if more than 90% of the lines have been modified. If
+ `m` is specified, then it is the minimum amount of deleted
+ lines a surviving broken pair must have to avoid being merged
+ back together. See linkgit:gitdiffcore[7] for more details.
+
+-M[<n>]::
ifndef::git-log[]
Detect renames.
endif::git-log[]
@@ -218,9 +226,11 @@ ifdef::git-log[]
For following files across renames while traversing history, see
`--follow`.
endif::git-log[]
+ If `n` is specified, it has the same meaning as for `-B<n>`.
--C::
+-C[<n>]::
Detect copies as well as renames. See also `--find-copies-harder`.
+ If `n` is specified, it has the same meaning as for `-B<n>`.
ifndef::git-format-patch[]
--diff-filter=[ACDMRTUXB*]::
--
1.7.2.25.g9ebe3
next reply other threads:[~2010-07-28 9:45 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-28 9:43 Matthieu Moy [this message]
2010-07-29 16:10 ` [RFC/PATCH] Document -B<n>[/<m>], -M<n> and -C<n> variants of -B, -M and -C Junio C Hamano
2010-07-30 15:23 ` Matthieu Moy
2010-07-30 16:42 ` Junio C Hamano
2010-08-02 11:12 ` [PATCH v2] " Matthieu Moy
2010-08-02 18:18 ` Junio C Hamano
2010-08-05 16:09 ` Matthieu Moy
2010-08-05 16:14 ` [PATCH] " Matthieu Moy
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1280310239-16897-1-git-send-email-Matthieu.Moy@imag.fr \
--to=matthieu.moy@imag.fr \
--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.
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 NNTP newsgroup(s).