repo.or.cz
/
alt-git.git
/
blob
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
blame
|
history
|
raw
|
HEAD
Expand ~ and ~user in core.excludesfile, commit.template
[alt-git.git]
/
t
/
t4013
/
diff.diff-tree_--cc_master
blob
5ecb4e14ae4718bb26dbe5657abd5660dc45914e
1
$ git diff-tree --cc master
2
59d314ad6f356dd08601a4cd5e530381da3e3c64
3
diff --cc dir/sub
4
index cead32e,7289e35..992913c
5
--- a/dir/sub
6
+++ b/dir/sub
7
@@@ -1,6 -1,4 +1,8 @@@
8
A
9
B
10
+C
11
+D
12
+E
13
+F
14
+ 1
15
+ 2
16
diff --cc file0
17
index b414108,f4615da..10a8a9f
18
--- a/file0
19
+++ b/file0
20
@@@ -1,6 -1,6 +1,9 @@@
21
1
22
2
23
3
24
+4
25
+5
26
+6
27
+ A
28
+ B
29
+ C
30
$