diff options
author | Junio C Hamano <junkio@cox.net> | 2005-07-13 12:52:35 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-13 13:09:17 -0700 |
commit | dda2d79af2d2858b37bab7f6e088d0730c0959d1 (patch) | |
tree | 0252e50a800caa678f835ee26193e5f728459f0a /Documentation/diff-options.txt | |
parent | 52f28529f4f90cebdca47f8eacbff5cb20004bed (diff) | |
download | git-dda2d79af2d2858b37bab7f6e088d0730c0959d1.tar.gz git-dda2d79af2d2858b37bab7f6e088d0730c0959d1.tar.xz |
[PATCH] Clean up diff option descriptions.
I got tired of maintaining almost duplicated descriptions in
diff-* brothers, both in usage string and documentation.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'Documentation/diff-options.txt')
-rw-r--r-- | Documentation/diff-options.txt | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt new file mode 100644 index 000000000..58b9c46c2 --- /dev/null +++ b/Documentation/diff-options.txt @@ -0,0 +1,53 @@ +-p:: + Generate patch (see section on generating patches) + +-u:: + Synonym for "-p". + +-r:: + Look recursivelly in subdirectories; this flag does not + mean anything to commands other than "git-diff-tree"; + other commands always looks at all the subdirectories. + +-z:: + \0 line termination on output + +--name-only:: + Show only names of changed files. + +--name-only-z:: + Same as --name-only, but terminate lines with NUL. + +-B:: + Break complete rewrite changes into pairs of delete and create. + +-M:: + Detect renames. + +-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. + +-S<string>:: + Look for differences that contains the change in <string>. + +--pickaxe-all:: + When -S finds a change, show all the changes in that + changeset, not just the files that contains the change + in <string>. + +-O<orderfile>:: + Output the patch in the order specified in the + <orderfile>, which has one shell glob pattern per line. + +-R:: + Swap two inputs; that is, show differences from cache or + on-disk file to tree contents. + |