diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-10-19 18:50:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-10-20 00:30:44 -0700 |
| commit | 18abd745a05197f498219f5ba88ce238a3d51580 (patch) | |
| tree | 69ab6177578a936f66c5c166bbaf0da32e421d0f /Documentation | |
| parent | d24bba8008d8e537cb48e9760f7621cbe7ae9e38 (diff) | |
| download | git-18abd745a05197f498219f5ba88ce238a3d51580.tar.gz git-18abd745a05197f498219f5ba88ce238a3d51580.tar.xz | |
git-pickaxe -C: blame cut-and-pasted lines.
This completes the initial round of git-pickaxe. In addition to
the detection of line movements we already have, this finds new
lines that were created by moving or cutting-and-pasting lines
from different files in the parent.
With this,
git pickaxe -f -n -C v1.4.0 -- revision.c
finds that a major part of that file actually came from
rev-list.c when Linus split the latter at commit ae563642 and
blames them to earlier commits that touch rev-list.c.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-pickaxe.txt | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Documentation/git-pickaxe.txt b/Documentation/git-pickaxe.txt index ebae20ff3..6d22fd9e9 100644 --- a/Documentation/git-pickaxe.txt +++ b/Documentation/git-pickaxe.txt @@ -9,7 +9,7 @@ SYNOPSIS -------- [verse] 'git-pickaxe' [-c] [-l] [-t] [-f] [-n] [-p] [-L n,m] [-S <revs-file>] - [-M] [--since=<date>] [<rev>] [--] <file> + [-M] [-C] [-C] [--since=<date>] [<rev>] [--] <file> DESCRIPTION ----------- @@ -73,6 +73,14 @@ OPTIONS to the child commit. With this option, both groups of lines are blamed on the parent. +-C:: + 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 looks for copies from all other files in the + parent for the commit that creates the file in addition. + -h, --help:: Show help message. |