diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-09-29 13:49:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-29 13:49:03 -0700 |
| commit | b3c16ee454effda5ec8033ab665249710f622699 (patch) | |
| tree | 9c50b0b2452c5332e7f37d769f5eec5484499e0e /Documentation | |
| parent | ae893e097ecbcbd8c6bea50017eb8cedddc5eaba (diff) | |
| parent | bf1dfc31032bf6195be63dd92d0b67906e4ff4f8 (diff) | |
| download | git-b3c16ee454effda5ec8033ab665249710f622699.tar.gz git-b3c16ee454effda5ec8033ab665249710f622699.tar.xz | |
Merge branch 'jc/pickaxe-grep'
* jc/pickaxe-grep:
diff/log -G<pattern>: tests
git log/diff: add -G<regexp> that greps in the patch text
diff: pass the entire diff-options to diffcore_pickaxe()
gitdiffcore doc: update pickaxe description
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/diff-options.txt | 6 | ||||
| -rw-r--r-- | Documentation/gitdiffcore.txt | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 4656a97e6..f77a0f874 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -284,8 +284,12 @@ ifndef::git-format-patch[] appearing in diff output; see the 'pickaxe' entry in linkgit:gitdiffcore[7] for more details. +-G<regex>:: + Look for differences whose added or removed line matches + the given <regex>. + --pickaxe-all:: - When `-S` finds a change, show all the changes in that + When `-S` or `-G` finds a change, show all the changes in that changeset, not just the files that contain the change in <string>. diff --git a/Documentation/gitdiffcore.txt b/Documentation/gitdiffcore.txt index 5d91a7e5b..6af29a460 100644 --- a/Documentation/gitdiffcore.txt +++ b/Documentation/gitdiffcore.txt @@ -227,9 +227,9 @@ changes that touch a specified string, and is controlled by the commands. When diffcore-pickaxe is in use, it checks if there are -filepairs whose "result" side has the specified string and -whose "origin" side does not. Such a filepair represents "the -string appeared in this changeset". It also checks for the +filepairs whose "result" side and whose "origin" side have +different number of specified string. Such a filepair represents +"the string appeared in this changeset". It also checks for the opposite case that loses the specified string. When `\--pickaxe-all` is not in effect, diffcore-pickaxe leaves |