projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix copy marking from diffcore-rename.
[git.git]
/
Documentation
/
git-diff-tree.txt
diff --git
a/Documentation/git-diff-tree.txt
b/Documentation/git-diff-tree.txt
index
244f285
..
9ec4b29
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] [-R] [-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,31
+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.
-
--M::
- Detect renames; implies -p, in turn implying also '-r'.
-
--R::
- Output diff in reverse.
+-t::
+ show tree entry itself as well as subtrees. Implies -r.
--r::
- recurse
-
--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
@@
-71,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
---------------
@@
-88,14
+86,14
@@
Or if you are searching for what changed in just `kernel/sched.c`, just do
and it will ignore all differences to other files.
The pattern is always the prefix, and is matched exactly. There are no
and it will ignore all differences to other files.
The pattern is always the prefix, and is matched exactly. There are no
-wildcards. Even stricter, it has to match
complete path com
onent.
+wildcards. Even stricter, it has to match
a complete path comp
onent.
I.e. "foo" does not pick up `foobar.h`. "foo" does match `foo/bar.h`
so it can be used to name subdirectories.
An example of normal usage is:
torvalds@ppc970:~/git> git-diff-tree 5319e4......
I.e. "foo" does not pick up `foobar.h`. "foo" does match `foo/bar.h`
so it can be used to name subdirectories.
An example of normal usage is:
torvalds@ppc970:~/git> git-diff-tree 5319e4......
- *100664->100664 blob ac348b.......->a01513....... git-fsck-
cache
.c
+ *100664->100664 blob ac348b.......->a01513....... git-fsck-
objects
.c
which tells you that the last commit changed just one file (it's from
this one:
which tells you that the last commit changed just one file (it's from
this one:
@@
-106,7
+104,7
@@
this one:
author Linus Torvalds <torvalds@ppc970.osdl.org> Sat Apr 9 12:02:30 2005
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat Apr 9 12:02:30 2005
author Linus Torvalds <torvalds@ppc970.osdl.org> Sat Apr 9 12:02:30 2005
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat Apr 9 12:02:30 2005
- Make "git-fsck-
cache
" print out all the root commits it finds.
+ Make "git-fsck-
objects
" print out all the root commits it finds.
Once I do the reference tracking, I'll also make it print out all the
HEAD commits it finds, which is even more interesting.
Once I do the reference tracking, I'll also make it print out all the
HEAD commits it finds, which is even more interesting.