threads / patch / 22130

patchDocument git-blame triple -C option

Subject: [PATCH] Document git-blame triple -C option

## tl;dr

3 messages between Jan 8, 2010 and Jan 8, 2010. Diffs are folded; open one to read it.

replies: 2people: 2as markdown or json

Ramkumar Ramachandra· Jan 8, 2010, 14:10 UTC · lore

The git-blame -CCC option is undocumented. This patch fixes that.

From 2732bf40f7607941ce1d65ce4d0effc0e8a0a593 Mon Sep 17 00:00:00 2001
From: Ramkumar Ramachandra <artagnon@gmail.com>
Date: Fri, 8 Jan 2010 19:29:02 +0530
Subject: [PATCH] Document git-blame triple -C option

git-blame -CCC is explained in builin-blame.c line 2171, but is unexplained in the documentation. This patch fixes that.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
 Documentation/blame-options.txt |   13 +++++++------
 Documentation/git-blame.txt     |    2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

Show changes to 2 files +8 −7

Documentation/blame-options.txt, Documentation/git-blame.txt

diff --git a/Documentation/blame-options.txt b/Documentation/blame-options.txt
index 1625ffc..e1abf1e 100644
--- a/Documentation/blame-options.txt
+++ b/Documentation/blame-options.txt
@@ -94,12 +94,13 @@ 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 all other
-	files in the parent for the commit that creates the file.
+	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 thrice, the command
+	additionally looks for copies from other files in any commit.
 +
 <num> is optional but it is the lower bound on the number of
 alphanumeric characters that git must detect as moving
diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt
index 8c7b7b0..25bc416 100644
--- a/Documentation/git-blame.txt
+++ b/Documentation/git-blame.txt
@@ -9,7 +9,7 @@ SYNOPSIS
 --------
 [verse]
 'git blame' [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-p] [-w] [--incremental] [-L n,m]
-            [-S <revs-file>] [-M] [-C] [-C] [--since=<date>]
+            [-S <revs-file>] [-M] [-C] [-C] [-C] [--since=<date>]
 	    [<rev> | --contents <file> | --reverse <rev>] [--] <file>
 
 DESCRIPTION

-- 
1.6.5

Michael J Gruber· Jan 8, 2010, 15:36 UTC · re: Ramkumar Ramachandra · lore

Re: [PATCH] Document git-blame triple -C option

Ramkumar Ramachandra venit, vidit, dixit 08.01.2010 15:10:

> The git-blame -CCC option is undocumented. This patch fixes that.

Above you see why it is difficult to comment on attached patches. They're not included!

You re-wrapped the existing documentation. Please don't do that, because it makes it difficult to spot what you really changed.

It seems you added one sentence. Please don't use "thrice" for "three times", that is very old English and sounds funny.

Michael

Ramkumar Ramachandra· Jan 8, 2010, 18:58 UTC · re: Michael J Gruber · lore

Re: [PATCH] Document git-blame triple -C option

> Above you see why it is difficult to comment on attached patches.
> They're not included!

I'm sorry, but I'm behind a HTTP proxy, and GMail mangles up patches. I'm left with no choice but to attach the patches.

> You re-wrapped the existing documentation. Please don't do that, because
> it makes it difficult to spot what you really changed.

Okay. Corrected.

> It seems you added one sentence. Please don't use "thrice" for "three
> times", that is very old English and sounds funny.

Okay. I've also modified the second line (what happens when the option is given twice) for clarity.

From 371705f64576ff7b8dc82bea19c714ce320097b9 Mon Sep 17 00:00:00 2001
From: Ramkumar Ramachandra <artagnon@gmail.com>
Date: Sat, 9 Jan 2010 00:18:07 +0530
Subject: [PATCH v2] Document git-blame triple -C option

git-blame -CCC is explained in builin-blame.c line 2171, but is unexplained in the documentation. This patch fixes that.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
 Documentation/blame-options.txt |    6 ++++--
 Documentation/git-blame.txt     |    2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

Show changes to 2 files +5 −3

Documentation/blame-options.txt, Documentation/git-blame.txt

diff --git a/Documentation/blame-options.txt b/Documentation/blame-options.txt
index 1625ffc..4833cac 100644
--- a/Documentation/blame-options.txt
+++ b/Documentation/blame-options.txt
@@ -98,8 +98,10 @@ commit.
 	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 all other
-	files in the parent for the commit that creates the file.
+	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.
 +
 <num> is optional but it is the lower bound on the number of
 alphanumeric characters that git must detect as moving
diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt
index 8c7b7b0..b786471 100644
--- a/Documentation/git-blame.txt
+++ b/Documentation/git-blame.txt
@@ -9,7 +9,7 @@ SYNOPSIS
 --------
 [verse]
 'git blame' [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-p] [-w] [--incremental] [-L n,m]
-            [-S <revs-file>] [-M] [-C] [-C] [--since=<date>]
+	    [-S <revs-file>] [-M] [-C] [-C] [-C] [--since=<date>]
 	    [<rev> | --contents <file> | --reverse <rev>] [--] <file>
 
 DESCRIPTION

-- 
1.6.5