summaryrefslogtreecommitdiff
path: root/Documentation/diff-format.txt
diff options
context:
space:
mode:
authorJakub Narebski <jnareb@gmail.com>2007-05-04 22:48:35 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-05-04 23:58:17 (GMT)
commit3b559eab55693111e0922cd3dd41bfdba2e22989 (patch)
treeb57203506f3847962f961ac90f74607d9d919f02 /Documentation/diff-format.txt
parent71f4b1834a8b4d1cb24ea326ca4a3fcc02796a5a (diff)
downloadgit-3b559eab55693111e0922cd3dd41bfdba2e22989.zip
git-3b559eab55693111e0922cd3dd41bfdba2e22989.tar.gz
git-3b559eab55693111e0922cd3dd41bfdba2e22989.tar.bz2
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>
Diffstat (limited to 'Documentation/diff-format.txt')
-rw-r--r--Documentation/diff-format.txt22
1 files changed, 22 insertions, 0 deletions
diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt
index 378e72f..e38a1f1 100644
--- a/Documentation/diff-format.txt
+++ b/Documentation/diff-format.txt
@@ -59,6 +59,28 @@ When `-z` option is not used, TAB, LF, and backslash characters
in pathnames are represented as `\t`, `\n`, and `\\`,
respectively.
+diff format for merges
+----------------------
+
+"git-diff-tree" and "git-diff-files" can take '-c' or '--cc' option
+to generate diff output also for merge commits. The output differs
+from the format described above in the following way:
+
+. there is a colon for each parent
+. there are more "src" modes and "src" sha1
+. status is concatenated status characters for each parent
+. no optional "score" number
+. single path, only for "dst"
+
+Example:
+
+------------------------------------------------
+::100644 100644 100644 fabadb8... cc95eb0... 4866510... MM describe.c
+------------------------------------------------
+
+Note that 'combined diff' lists only files which were modified from
+all parents.
+
Generating patches with -p
--------------------------