diff options
| author |  Yann Dirson <ydirson@altern.org> | 2010-11-10 21:27:13 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-11-16 09:29:37 -0800 |
| commit | f1037448e29104cdad73b93cb961e3b40e08e925 (patch) | |
| tree | 622b3f013fed0aec8bdb314a72d729641d834321 /Documentation | |
| parent | rebase -X: do not clobber strategy (diff) | |
| download | tgif-f1037448e29104cdad73b93cb961e3b40e08e925.tar.xz | |
Keep together options controlling the behaviour of diffcore-rename.
It makes little sense to have --diff-filter in the middle of them, and
even spares an ifndef::git-format-patch.
Signed-off-by: Yann Dirson <ydirson@altern.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/diff-options.txt | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index d723e99232..5495344e61 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -247,20 +247,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 @@ -278,6 +264,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 |