projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] git-merge-cache -q doesn't complain about failing merge program
[git.git]
/
Documentation
/
git-diff-tree.txt
diff --git
a/Documentation/git-diff-tree.txt
b/Documentation/git-diff-tree.txt
index
ff7f25f
..
b2095cb
100644
(file)
--- a/
Documentation/git-diff-tree.txt
+++ b/
Documentation/git-diff-tree.txt
@@
-9,7
+9,7
@@
git-diff-tree - Compares the content and mode of blobs found via two tree object
SYNOPSIS
--------
SYNOPSIS
--------
-'git-diff-tree' [-
p] [-r] [-z] [--stdin] [-m] [-s] [-v] <tree-ish> <tree-ish> [<pattern>]\*
+'git-diff-tree' [-
-stdin] [-m] [-s] [-v] [--pretty] [-t] [<common diff options>] <tree-ish> <tree-ish> [<path>...]
DESCRIPTION
-----------
DESCRIPTION
-----------
@@
-19,25
+19,24
@@
Note that "git-diff-tree" can use the tree encapsulated in a commit object.
OPTIONS
-------
OPTIONS
-------
+include::diff-options.txt[]
+
<tree-ish>::
The id of a tree object.
<tree-ish>::
The id of a tree object.
-<pat
tern>
::
+<pat
h>...
::
If provided, the results are limited to a subset of files
matching one of these prefix strings.
ie file matches `/^<pattern1>|<pattern2>|.../`
If provided, the results are limited to a subset of files
matching one of these prefix strings.
ie file matches `/^<pattern1>|<pattern2>|.../`
- Note that
pattern
does not provide any wildcard or regexp
+ Note that
this parameter
does not provide any wildcard or regexp
features.
features.
--p::
- generate patch (see section on generating patches). For
- git-diff-tree, this flag implies '-r' as well.
-
--r::
- recurse
+-t::
+ show tree entry itself as well as subtrees. Implies -r.
--z::
- \0 line termination on output
+--root::
+ When '--root' is specified the initial commit will be showed as a big
+ creation event. This is equivalent to a diff against the NULL tree.
--stdin::
When '--stdin' is specified, the command does not take
--stdin::
When '--stdin' is specified, the command does not take
@@
-65,6
+64,11
@@
separated with a single space are given.
This flag causes "git-diff-tree --stdin" to also show
the commit message before the differences.
This flag causes "git-diff-tree --stdin" to also show
the commit message before the differences.
+--pretty[=(raw|medium|short)]::
+ This is used to control "pretty printing" format of the
+ commit message. Without "=<style>", it defaults to
+ medium.
+
Limiting Output
---------------
Limiting Output
---------------