summaryrefslogtreecommitdiff
path: root/t/t4013/diff.log_--root_master
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-06-26 13:46:52 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-06-26 14:36:40 -0700
commit3c2f75b590c35675cc67dc43cabe2298bec86afc (patch)
tree1197b6f0568d6aae04004be6e398320e8741604e /t/t4013/diff.log_--root_master
parentMerge branch 'jc/squash' (diff)
downloadtgif-3c2f75b590c35675cc67dc43cabe2298bec86afc.tar.xz
t4013: add tests for diff/log family output options.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/t4013/diff.log_--root_master')
-rw-r--r--t/t4013/diff.log_--root_master32
1 files changed, 32 insertions, 0 deletions
diff --git a/t/t4013/diff.log_--root_master b/t/t4013/diff.log_--root_master
new file mode 100644
index 0000000000..7554a468d1
--- /dev/null
+++ b/t/t4013/diff.log_--root_master
@@ -0,0 +1,32 @@
+$ git log --root master
+commit 176b998f5d647cbd77a9d8acf4531e930754d16d
+Merge: 889b315... c7a2ab9...
+Author: A U Thor <author@example.com>
+Date: Mon Jun 26 00:04:00 2006 +0000
+
+ Merge branch 'side'
+
+commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
+Author: A U Thor <author@example.com>
+Date: Mon Jun 26 00:03:00 2006 +0000
+
+ Side
+
+commit 889b315013ef9f2e2f90aa0b054b267c8a557847
+Author: A U Thor <author@example.com>
+Date: Mon Jun 26 00:02:00 2006 +0000
+
+ Third
+
+commit 7952a93e09bf565b5592766a438b40cd81f4846f
+Author: A U Thor <author@example.com>
+Date: Mon Jun 26 00:01:00 2006 +0000
+
+ Second
+
+commit 444ac553ac7612cc88969031b02b3767fb8a353a
+Author: A U Thor <author@example.com>
+Date: Mon Jun 26 00:00:00 2006 +0000
+
+ Initial
+$