diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-05-21 02:40:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-21 09:58:03 -0700 |
| commit | 52e9578985fb636ec1d3f6cf794fdadd5ec896fc (patch) | |
| tree | bb22f522116f5d8e6ae677b7a4660e959c052fc2 /Documentation/git-diff-files.txt | |
| parent | 427dcb4bca49117664d9428fd4e86483f516d703 (diff) | |
| download | git-52e9578985fb636ec1d3f6cf794fdadd5ec896fc.tar.gz git-52e9578985fb636ec1d3f6cf794fdadd5ec896fc.tar.xz | |
[PATCH] Introducing software archaeologist's tool "pickaxe".
This steals the "pickaxe" feature from JIT and make it available
to the bare Plumbing layer. From the command line, the user
gives a string he is intersted in.
Using the diff-core infrastructure previously introduced, it
filters the differences to limit the output only to the diffs
between <src> and <dst> where the string appears only in one but
not in the other. For example:
$ ./git-rev-list HEAD | ./git-diff-tree -Sdiff-tree-helper --stdin -M
would show the diffs that touch the string "diff-tree-helper".
In real software-archaeologist application, you would typically
look for a few to several lines of code and see where that code
came from.
The "pickaxe" module runs after "rename/copy detection" module,
so it even crosses the file rename boundary, as the above
example demonstrates.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'Documentation/git-diff-files.txt')
| -rw-r--r-- | Documentation/git-diff-files.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.txt index 1eae3d033..51a3d0fcd 100644 --- a/Documentation/git-diff-files.txt +++ b/Documentation/git-diff-files.txt @@ -9,7 +9,7 @@ git-diff-files - Compares files in the working tree and the cache SYNOPSIS -------- -'git-diff-files' [-p] [-q] [-r] [-z] [-M] [-C] [-R] [<pattern>...] +'git-diff-files' [-p] [-q] [-r] [-z] [-M] [-C] [-R] [-S<string>] [<pattern>...] DESCRIPTION ----------- @@ -35,6 +35,10 @@ OPTIONS -C:: Detect copies as well as renames; implies -p. +-S<string>:: + Look for differences that contains the change in <string>. + + -r:: This flag does not mean anything. It is there only to match git-diff-tree. Unlike git-diff-tree, git-diff-files always looks |