diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-11-18 00:53:09 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-11-18 00:53:09 +0000 |
| commit | 982eb11dc5ca975628029adef95a96309ae25294 (patch) | |
| tree | d4bedc784e5b27293e50d6657b2171549f0be2d6 /diff-options.txt | |
| parent | c3fda57fff8451d3c28afc16c6ace06cfd087981 (diff) | |
| download | git-htmldocs-982eb11dc5ca975628029adef95a96309ae25294.tar.gz | |
Autogenerated HTML docs for v1.7.3.2-245-g03276
Diffstat (limited to 'diff-options.txt')
| -rw-r--r-- | diff-options.txt | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/diff-options.txt b/diff-options.txt index bfd0b571e..f3e95389a 100644 --- a/diff-options.txt +++ b/diff-options.txt @@ -250,20 +250,6 @@ endif::git-log[] Detect copies as well as renames. See also `--find-copies-harder`. If `n` is specified, it has the same meaning as for `-M<n>`. -ifndef::git-format-patch[] ---diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]:: - Select only files that are Added (`A`), Copied (`C`), - Deleted (`D`), Modified (`M`), Renamed (`R`), have their - type (i.e. regular file, symlink, submodule, ...) changed (`T`), - are Unmerged (`U`), are - Unknown (`X`), or have had their pairing Broken (`B`). - Any combination of the filter characters (including none) can be used. - When `*` (All-or-none) is added to the combination, all - paths are selected if there is any file that matches - other criteria in the comparison; if there is no file - that matches other criteria, nothing is selected. -endif::git-format-patch[] - --find-copies-harder:: For performance reasons, by default, `-C` option finds copies only if the original file of the copy was modified in the same @@ -281,6 +267,18 @@ endif::git-format-patch[] number. ifndef::git-format-patch[] +--diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]:: + Select only files that are Added (`A`), Copied (`C`), + Deleted (`D`), Modified (`M`), Renamed (`R`), have their + type (i.e. regular file, symlink, submodule, ...) changed (`T`), + are Unmerged (`U`), are + Unknown (`X`), or have had their pairing Broken (`B`). + Any combination of the filter characters (including none) can be used. + When `*` (All-or-none) is added to the combination, all + paths are selected if there is any file that matches + other criteria in the comparison; if there is no file + that matches other criteria, nothing is selected. + -S<string>:: Look for differences that introduce or remove an instance of <string>. Note that this is different than the string simply |