Skip to content

Commit 9c90dab

Browse files
committed
Merge branch 'ab/diff-tree-doc-fix'
Doc fix. * ab/diff-tree-doc-fix: diff-tree doc: correct & remove wrong documentation
2 parents a1e1900 + 9fce19a commit 9c90dab

File tree

1 file changed

+1
-50
lines changed

1 file changed

+1
-50
lines changed

Documentation/git-diff-tree.txt

Lines changed: 1 addition & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,7 @@ include::diff-options.txt[]
3131

3232
<path>...::
3333
If provided, the results are limited to a subset of files
34-
matching one of these prefix strings.
35-
i.e., file matches `/^<pattern1>|<pattern2>|.../`
36-
Note that this parameter does not provide any wildcard or regexp
37-
features.
34+
matching one of the provided pathspecs.
3835

3936
-r::
4037
recurse into sub-trees
@@ -114,52 +111,6 @@ include::pretty-options.txt[]
114111

115112

116113
include::pretty-formats.txt[]
117-
118-
119-
LIMITING OUTPUT
120-
---------------
121-
If you're only interested in differences in a subset of files, for
122-
example some architecture-specific files, you might do:
123-
124-
git diff-tree -r <tree-ish> <tree-ish> arch/ia64 include/asm-ia64
125-
126-
and it will only show you what changed in those two directories.
127-
128-
Or if you are searching for what changed in just `kernel/sched.c`, just do
129-
130-
git diff-tree -r <tree-ish> <tree-ish> kernel/sched.c
131-
132-
and it will ignore all differences to other files.
133-
134-
The pattern is always the prefix, and is matched exactly. There are no
135-
wildcards. Even stricter, it has to match a complete path component.
136-
I.e. "foo" does not pick up `foobar.h`. "foo" does match `foo/bar.h`
137-
so it can be used to name subdirectories.
138-
139-
An example of normal usage is:
140-
141-
torvalds@ppc970:~/git> git diff-tree --abbrev 5319e4
142-
:100664 100664 ac348b... a01513... git-fsck-objects.c
143-
144-
which tells you that the last commit changed just one file (it's from
145-
this one:
146-
147-
-----------------------------------------------------------------------------
148-
commit 3c6f7ca19ad4043e9e72fa94106f352897e651a8
149-
tree 5319e4d609cdd282069cc4dce33c1db559539b03
150-
parent b4e628ea30d5ab3606119d2ea5caeab141d38df7
151-
author Linus Torvalds <[email protected]> Sat Apr 9 12:02:30 2005
152-
committer Linus Torvalds <[email protected]> Sat Apr 9 12:02:30 2005
153-
154-
Make "git-fsck-objects" print out all the root commits it finds.
155-
156-
Once I do the reference tracking, I'll also make it print out all the
157-
HEAD commits it finds, which is even more interesting.
158-
-----------------------------------------------------------------------------
159-
160-
in case you care).
161-
162-
163114
include::diff-format.txt[]
164115

165116
GIT

0 commit comments

Comments
 (0)