aboutsummaryrefslogtreecommitdiffstats
path: root/t/t4013/diff.diff_initial..side
blob: c8adaf595863e66fb9ae061cd20176c981316372 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
$ git diff initial..side
diff --git a/dir/sub b/dir/sub
index 35d242b..7289e35 100644
--- a/dir/sub
+++ b/dir/sub
@@ -1,2 +1,4 @@
 A
 B
+1
+2
diff --git a/file0 b/file0
index 01e79c3..f4615da 100644
--- a/file0
+++ b/file0
@@ -1,3 +1,6 @@
 1
 2
 3
+A
+B
+C
diff --git a/file3 b/file3
new file mode 100644
index 0000000..7289e35
--- /dev/null
+++ b/file3
@@ -0,0 +1,4 @@
+A
+B
+1
+2
$
4-06-12ocfs2: switch to iter_file_splice_write()Al Viro1-80/+2 2014-06-12->splice_write() via ->write_iter()Al Viro16-56/+156 2014-06-11reiserfs: Fix compilation breakage with CONFIG_REISERFS_CHECKJan Kara1-1/+1 2014-06-10hp-wmi: Enable hotkeys on some systemsKyle Evans1-0/+18 2014-06-10thinkpad_acpi: Add mappings for F9 - F12 hotkeys on X240 / T440 / T540Hans de Goede1-1/+3 2014-06-10platform: x86: dell-smo8800: Dell Latitude freefall driver (ACPI SMO8800/SMO8...Pali Rohár3-0/+244 2014-06-10ideapad_laptop: Introduce the use of the managed version of kzallocHimangi Saraogi1-5/+3 2014-06-10platform/x86: Fix run-time dependencies of OLPC driversJean Delvare1-1/+2 2014-06-10platform: x86: asus-wmi.c: Cleaning up uninitialized variablesRickard Strandqvist1-3/+1 2014-06-10ix86/mid/thermal: Introduce the use of the managed version of kzallocHimangi Saraogi1-5/+2 2014-06-10platform x86 Kconfig: Refer to the laptop list in the Compal driver helpIsmael Luceno1-10/+8