From: Bo Yang <struggleyb.nku@gmail.com>
To: git@vger.kernel.org
Cc: trast@student.ethz.ch, gitster@pobox.com
Subject: [PATCH 2/2] Change the description of '-M' and '-C' option.
Date: Wed, 7 Apr 2010 23:51:30 -0700 [thread overview]
Message-ID: <1270709490-19163-3-git-send-email-struggleyb.nku@gmail.com> (raw)
In-Reply-To: <1270709490-19163-2-git-send-email-struggleyb.nku@gmail.com>
Both '-M' and '-C' option detect code moving and copying.
The difference between the two options is whether they
search across file boundary.
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Bo Yang <struggleyb.nku@gmail.com>
---
Documentation/blame-options.txt | 41 +++++++++++++++++++++++---------------
1 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/Documentation/blame-options.txt b/Documentation/blame-options.txt
index 4833cac..aca2a1c 100644
--- a/Documentation/blame-options.txt
+++ b/Documentation/blame-options.txt
@@ -79,14 +79,15 @@ of lines before or after the line given by <start>.
of the --date option at linkgit:git-log[1].
-M|<num>|::
- Detect moving lines in the file as well. When a commit
- moves a block of lines in a file (e.g. the original file
- has A and then B, and the commit changes it to B and
- then A), the traditional 'blame' algorithm typically blames
- the lines that were moved up (i.e. B) to the parent and
- assigns blame to the lines that were moved down (i.e. A)
- to the child commit. With this option, both groups of lines
- are blamed on the parent.
+ Detect moving/copying lines in the file as well. Instead of
+ taking blame for all added lines, attempt to find the same
+ lines 'in the same file' in the parent commit. If such a
+ match was found, shift the blame to these lines in the
+ parent. (This expends extra effort on the order of the size
+ of the file for every change.)
++
+The net effect is that if code is moved or copied within the file, the
+lines are attributed to the original instead of the move/copy.
+
<num> is optional but it is the lower bound on the number of
alphanumeric characters that git must detect as moving
@@ -94,14 +95,22 @@ within a file for it to associate those lines with the parent
commit.
-C|<num>|::
- In addition to `-M`, detect lines copied from other
- files that were modified in the same commit. This is
- useful when you reorganize your program and move code
- around across files. When this option is given twice,
- the command additionally looks for copies from other
- files in the commit that creates the file. When this
- option is given three times, the command additionally
- looks for copies from other files in any commit.
+ Like `-M`, detect moving/copying lines between files as well.
+ Instead of taking blame for all added lines, attempt to find the same
+ lines across file boundary according to the number of given `-C`.
+ This is useful when you reorganize your program and move/copy
+ code around across files. When this option is given once, detect
+ lines moved/copied from other files that were modified in the
+ same commit. (This expends extra effort on the order of
+ <number of modified files>*<file size> for every change.) When this
+ option is given twice, the command additionally looks for moves/copies
+ from other files in the commit that creates this file. (This expends
+ extra effort on the order of <number of files in the commit>*<file size>
+ for every change.) When this option is given three times, the
+ command additionally looks for moves/copies from other files
+ in any commit. (This expends extra effort on the order of
+ <commit number>*<number of files in one commit>*<file size>
+ for every change.)
+
<num> is optional but it is the lower bound on the number of
alphanumeric characters that git must detect as moving
--
1.6.0.4
next prev parent reply other threads:[~2010-04-08 6:51 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-08 6:51 [PATCH 0/2] Document update for 'git-blame' '-M' and '-C' option Bo Yang
2010-04-08 6:51 ` [PATCH 1/2] Add a basic idea section for git-blame Bo Yang
2010-04-08 6:51 ` Bo Yang [this message]
2010-04-08 8:00 ` Junio C Hamano
2010-04-08 16:27 ` Thomas Rast
2010-04-08 16:51 ` Junio C Hamano
2010-04-09 5:11 ` Bo Yang
-- strict thread matches above, loose matches on Subject: below --
2010-04-08 8:07 [PATCH 2/2] Change the description of '-M' and '-C' option Yann Dirson
2010-04-09 5:15 ` Bo Yang
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=1270709490-19163-3-git-send-email-struggleyb.nku@gmail.com \
--to=struggleyb.nku@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=trast@student.ethz.ch \
/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).