diff format documentation: describe raw combined diff format
Add description of raw combined diff format to diff-formats.txt, as "diff format for merges" section, before "Generating patches..." section. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Jakub Narebski committed
May 5, 2007 at 00:48 UTC
3b559eab55693111e0922cd3dd41bfdba2e22989
1 file changed
+22
Documentation/diff-format.txt
+22
@@ -59,6 +59,28 @@ When `-z` option is not used, TAB, LF, and backslash characters
59
in pathnames are represented as `\t`, `\n`, and `\\`,
60
respectively.
61
62
+diff format for merges
63
+----------------------
64
+
65
+"git-diff-tree" and "git-diff-files" can take '-c' or '--cc' option
66
+to generate diff output also for merge commits. The output differs
67
+from the format described above in the following way:
68
+
69
+. there is a colon for each parent
70
+. there are more "src" modes and "src" sha1
71
+. status is concatenated status characters for each parent
72
+. no optional "score" number
73
+. single path, only for "dst"
74
+
75
+Example:
76
+
77
+------------------------------------------------
78
+::100644 100644 100644 fabadb8... cc95eb0... 4866510... MM describe.c
79
+------------------------------------------------
80
+
81
+Note that 'combined diff' lists only files which were modified from
82
+all parents.
83
+
84
85
Generating patches with -p
86
--------------------------