-
Notifications
You must be signed in to change notification settings - Fork 25.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* 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
- Loading branch information
Showing
10 changed files
with
226 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
$ git log -GF -p --pickaxe-all master | ||
commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 | ||
Author: A U Thor <author@example.com> | ||
Date: Mon Jun 26 00:02:00 2006 +0000 | ||
|
||
Third | ||
|
||
diff --git a/dir/sub b/dir/sub | ||
index 8422d40..cead32e 100644 | ||
--- a/dir/sub | ||
+++ b/dir/sub | ||
@@ -2,3 +2,5 @@ A | ||
B | ||
C | ||
D | ||
+E | ||
+F | ||
diff --git a/file1 b/file1 | ||
new file mode 100644 | ||
index 0000000..b1e6722 | ||
--- /dev/null | ||
+++ b/file1 | ||
@@ -0,0 +1,3 @@ | ||
+A | ||
+B | ||
+C | ||
$ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
$ git log -GF -p master | ||
commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 | ||
Author: A U Thor <author@example.com> | ||
Date: Mon Jun 26 00:02:00 2006 +0000 | ||
|
||
Third | ||
|
||
diff --git a/dir/sub b/dir/sub | ||
index 8422d40..cead32e 100644 | ||
--- a/dir/sub | ||
+++ b/dir/sub | ||
@@ -2,3 +2,5 @@ A | ||
B | ||
C | ||
D | ||
+E | ||
+F | ||
$ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
$ git log -GF master | ||
commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 | ||
Author: A U Thor <author@example.com> | ||
Date: Mon Jun 26 00:02:00 2006 +0000 | ||
|
||
Third | ||
$ |