зеркало из https://github.com/microsoft/git.git
Merge branch 'ab/diff-tree-doc-fix'
Doc fix. * ab/diff-tree-doc-fix: diff-tree doc: correct & remove wrong documentation
This commit is contained in:
Коммит
9c90dab1b0
|
@ -31,10 +31,7 @@ include::diff-options.txt[]
|
||||||
|
|
||||||
<path>...::
|
<path>...::
|
||||||
If provided, the results are limited to a subset of files
|
If provided, the results are limited to a subset of files
|
||||||
matching one of these prefix strings.
|
matching one of the provided pathspecs.
|
||||||
i.e., file matches `/^<pattern1>|<pattern2>|.../`
|
|
||||||
Note that this parameter does not provide any wildcard or regexp
|
|
||||||
features.
|
|
||||||
|
|
||||||
-r::
|
-r::
|
||||||
recurse into sub-trees
|
recurse into sub-trees
|
||||||
|
@ -114,52 +111,6 @@ include::pretty-options.txt[]
|
||||||
|
|
||||||
|
|
||||||
include::pretty-formats.txt[]
|
include::pretty-formats.txt[]
|
||||||
|
|
||||||
|
|
||||||
LIMITING OUTPUT
|
|
||||||
---------------
|
|
||||||
If you're only interested in differences in a subset of files, for
|
|
||||||
example some architecture-specific files, you might do:
|
|
||||||
|
|
||||||
git diff-tree -r <tree-ish> <tree-ish> arch/ia64 include/asm-ia64
|
|
||||||
|
|
||||||
and it will only show you what changed in those two directories.
|
|
||||||
|
|
||||||
Or if you are searching for what changed in just `kernel/sched.c`, just do
|
|
||||||
|
|
||||||
git diff-tree -r <tree-ish> <tree-ish> kernel/sched.c
|
|
||||||
|
|
||||||
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 a complete path component.
|
|
||||||
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 --abbrev 5319e4
|
|
||||||
:100664 100664 ac348b... a01513... git-fsck-objects.c
|
|
||||||
|
|
||||||
which tells you that the last commit changed just one file (it's from
|
|
||||||
this one:
|
|
||||||
|
|
||||||
-----------------------------------------------------------------------------
|
|
||||||
commit 3c6f7ca19ad4043e9e72fa94106f352897e651a8
|
|
||||||
tree 5319e4d609cdd282069cc4dce33c1db559539b03
|
|
||||||
parent b4e628ea30d5ab3606119d2ea5caeab141d38df7
|
|
||||||
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-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.
|
|
||||||
-----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
in case you care).
|
|
||||||
|
|
||||||
|
|
||||||
include::diff-format.txt[]
|
include::diff-format.txt[]
|
||||||
|
|
||||||
GIT
|
GIT
|
||||||
|
|
Загрузка…
Ссылка в новой задаче