diff options
| author |  Junio C Hamano <junkio@cox.net> | 2005-06-19 13:14:53 -0700 |
|---|---|---|
| committer |  Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-19 20:13:18 -0700 |
| commit | 232b75ab3d60475b19270be022a966772c25c84b (patch) | |
| tree | 399cf4604d7737ec89fa646b8aff6c65d3409dcd /Documentation/git-diff-tree.txt | |
| parent | [PATCH] Make -C less eager. (diff) | |
| download | tgif-232b75ab3d60475b19270be022a966772c25c84b.tar.xz | |
[PATCH] Update diff documentation.
This updates diff documentation to discuss --find-copies-harder,
and adds descriptions for options that were not described
earlier.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'Documentation/git-diff-tree.txt')
| -rw-r--r-- | Documentation/git-diff-tree.txt | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt index 762546bfe9..ab0ba4fb17 100644 --- 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 -------- -'git-diff-tree' [-p] [-r] [-z] [--stdin] [-B] [-M] [-R] [-C] [-O<orderfile>] [-S<string>] [--pickaxe-all] [-m] [-s] [-v] [-t] <tree-ish> <tree-ish> [<pattern>]\* +'git-diff-tree' [-p] [-r] [-z] [--stdin] [-m] [-s] [-v] [-t] [-R] [-B] [-M] [-C] [--find-copies-harder] [-O<orderfile>] [-S<string>] [--pickaxe-all] <tree-ish> <tree-ish> [<path>...] DESCRIPTION ----------- @@ -22,11 +22,11 @@ OPTIONS <tree-ish>:: The id of a tree object. -<pattern>:: +<path>...:: 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. -p:: @@ -42,6 +42,14 @@ OPTIONS -C:: Detect copies as well as renames. +--find-copies-harder:: + By default, -C option finds copies only if the original + file of the copy was modified in the same changeset for + performance reasons. This flag makes the command + inspect unmodified files as candidates for the source of + copy. This is a very expensive operation for large + projects, so use it with caution. + -R:: Swap two input trees. @@ -96,6 +104,11 @@ separated with a single space are given. 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 --------------- |