summaryrefslogtreecommitdiff
path: root/t/t4013/diff.log_-S_F_master
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-08-21 23:28:31 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-08-21 23:28:31 -0700
commite40b34b1ec2c91aaed5572116cd8d01afff7851f (patch)
treefe592011faace9f63915472f2ab791ca0428d74a /t/t4013/diff.log_-S_F_master
parentMerge branch 'sr/local-config' (diff)
parentlog: parse separate option for --glob (diff)
downloadtgif-e40b34b1ec2c91aaed5572116cd8d01afff7851f.tar.xz
Merge branch 'mm/shortopt-detached'
* mm/shortopt-detached: log: parse separate option for --glob log: parse separate options like git log --grep foo diff: parse separate options --stat-width n, --stat-name-width n diff: split off a function for --stat-* option parsing diff: parse separate options like -S foo Conflicts: revision.c
Diffstat (limited to 't/t4013/diff.log_-S_F_master')
-rw-r--r--t/t4013/diff.log_-S_F_master7
1 files changed, 7 insertions, 0 deletions
diff --git a/t/t4013/diff.log_-S_F_master b/t/t4013/diff.log_-S_F_master
new file mode 100644
index 0000000000..978d2b4118
--- /dev/null
+++ b/t/t4013/diff.log_-S_F_master
@@ -0,0 +1,7 @@
+$ git log -S F master
+commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
+Author: A U Thor <author@example.com>
+Date: Mon Jun 26 00:02:00 2006 +0000
+
+ Third
+$