summaryrefslogtreecommitdiff
path: root/t/t4013/diff.log_-GF_master
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-09-29 13:49:03 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-09-29 13:49:03 -0700
commitb3c16ee454effda5ec8033ab665249710f622699 (patch)
tree9c50b0b2452c5332e7f37d769f5eec5484499e0e /t/t4013/diff.log_-GF_master
parentMerge branch 'gb/shell-ext' (diff)
parentdiff/log -G<pattern>: tests (diff)
downloadtgif-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 't/t4013/diff.log_-GF_master')
-rw-r--r--t/t4013/diff.log_-GF_master7
1 files changed, 7 insertions, 0 deletions
diff --git a/t/t4013/diff.log_-GF_master b/t/t4013/diff.log_-GF_master
new file mode 100644
index 0000000000..4c6708d2d0
--- /dev/null
+++ b/t/t4013/diff.log_-GF_master
@@ -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
+$