Merge branch 'maint-1.7.3' into maint-1.7.4
[git] / t / t4013 / diff.log_-GF_-p_--pickaxe-all_master
1 $ git log -GF -p --pickaxe-all master
2 commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
3 Author: A U Thor <author@example.com>
4 Date:   Mon Jun 26 00:02:00 2006 +0000
5
6     Third
7
8 diff --git a/dir/sub b/dir/sub
9 index 8422d40..cead32e 100644
10 --- a/dir/sub
11 +++ b/dir/sub
12 @@ -2,3 +2,5 @@ A
13  B
14  C
15  D
16 +E
17 +F
18 diff --git a/file1 b/file1
19 new file mode 100644
20 index 0000000..b1e6722
21 --- /dev/null
22 +++ b/file1
23 @@ -0,0 +1,3 @@
24 +A
25 +B
26 +C
27 $