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
$
rningGeert Uytterhoeven1-1/+1 2017-09-10x86/mm/64: Fix an incorrect warning with CONFIG_DEBUG_VM=y, !PCIDAndy Lutomirski1-1/+1 2017-09-09sparc64: Handle additional cases of no fault loadsRob Gardner1-0/+51 2017-09-09sparc64: speed up etrap/rtrap on NG2 and later processorsAnthony Yznaga5-6/+45 2017-09-09Bluetooth: Properly check L2CAP config option output buffer lengthBen Seri1-37/+43 2017-09-09NFS: Count the bytes of skipped subrequests in nfs_lock_and_join_requests()Trond Myklebust1-1/+5 2017-09-09NFS: Don't hold the group lock when calling nfs_release_request()Trond Myklebust1-1/+1 2017-09-09libnvdimm, btt: fix format string warningsRandy Dunlap1-2/+2 2017-09-09remove gperf left-overs from build systemLinus Torvalds1-9/+0 2017-09-09NFS: Remove pnfs_generic_transfer_commit_list()Trond Myklebust2-41/+4 2017-09-09NFS: nfs_lock_and_join_requests and nfs_scan_commit_list can deadlockTrond Myklebust2-9/+22 2017-09-09ARM: 8691/1: Export save_stack_trace_tsk()Dustin Brown1-0/+1 2017-09-08bpf: make error reporting in bpf_warn_invalid_xdp_action more clearDaniel Borkmann2-3/+7 2017-09-08Revert "mdio_bus: Remove unneeded gpiod NULL check"Florian Fainelli1-2/+4 2017-09-08bpf: devmap, use cond_resched instead of cpu_relaxJohn Fastabend1-1/+1 2017-09-08bpf: add support for sockmap detach programsJohn Fastabend4-16/+72 2017-09-08net: rcu lock and preempt disable missing around generic xdpJohn Fastabend1-9/+16 2017-09-08bpf: don't select potentially stale ri->map from buggy xdp progsDaniel Borkmann2-2/+35 2017-09-08net: tulip: Constify tulip_tblKees Cook2-2/+2 2017-09-08net: ethernet: ti: netcp_core: no need in netif_napi_delIvan Khoronzhuk1-1/+0 2017-09-08davicom: Display proper debug level up to 6Mathieu Malaterre1-1/+1 2017-09-08net: phy: sfp: rename dt properties to match the bindingBaruch Siach1-2/+2