X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-diff-tree.txt;h=9153e4cf2a1020dc9a3b5792ff3f64f7efd9f42c;hb=3904848c6ea8815236db66956f6a7d77e13fb384;hp=f57c8d0d8191dae8be8db930ef8b38ddc9c42623;hpb=e634aec752642dcf86c3fc82025e43381d6768c2;p=git.git

diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt
index f57c8d0d..9153e4cf 100644
--- a/Documentation/git-diff-tree.txt
+++ b/Documentation/git-diff-tree.txt
@@ -8,7 +8,10 @@ git-diff-tree - Compares the content and mode of blobs found via two tree object
 
 SYNOPSIS
 --------
-'git-diff-tree' [--stdin] [-m] [-s] [-v] [--pretty] [-t] [-r] [--root] [<common diff options>] <tree-ish> [<tree-ish>] [<path>...]
+[verse]
+'git-diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]
+	      [-t] [-r] [-c | --cc] [--root] [<common diff options>]
+	      <tree-ish> [<tree-ish>] [<path>...]
 
 DESCRIPTION
 -----------
@@ -62,7 +65,7 @@ separated with a single space are given.
 -s::
 	By default, "git-diff-tree --stdin" shows differences,
 	either in machine-readable form (without '-p') or in patch
-	form (with '-p').  This output can be supressed.  It is
+	form (with '-p').  This output can be suppressed.  It is
 	only useful with '-v' flag.
 
 -v::
@@ -74,6 +77,28 @@ separated with a single space are given.
 	commit message.  Without "=<style>", it defaults to
 	medium.
 
+--no-commit-id::
+	git-diff-tree outputs a line with the commit ID when
+	applicable.  This flag suppressed the commit ID output.
+
+-c,--cc::
+	These flags change the way a merge commit is displayed
+	(which means it is useful only when the command is given
+	one <tree-ish>, or '--stdin').  It shows the differences
+	from each of the parents to the merge result
+	simultaneously, instead of showing pairwise diff between
+	a parent and the result one at a time, which '-m' option
+	output does.  '--cc' further compresses the output by
+	omiting hunks that show differences from only one
+	parent, or show the same change from all but one parent
+	for an Octopus merge.  When this optimization makes all
+	hunks disappear, the commit itself and the commit log
+	message is not shown, just like any other "empty diff" cases.
+
+--always::
+	Show the commit itself and the commit log message even
+	if the diff itself is empty.
+
 
 Limiting Output
 ---------------