kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Yann Dirson 2010-11-10 21:27:13 +01:00 committed by Junio C Hamano
parent f772c34ce0
commit f1037448e2
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Documentation/diff-options.txt
View File

@ -247,20 +247,6 @@ endif::git-log[]
Detect copies as well as renames. See also `--find-copies-harder`. Detect copies as well as renames. See also `--find-copies-harder`.
If `n` is specified, it has the same meaning as for `-M<n>`. 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:: --find-copies-harder::
For performance reasons, by default, `-C` option finds copies only For performance reasons, by default, `-C` option finds copies only
if the original file of the copy was modified in the same if the original file of the copy was modified in the same
@ -278,6 +264,18 @@ endif::git-format-patch[]
number. number.


ifndef::git-format-patch[] 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>:: -S<string>::
Look for differences that introduce or remove an instance of Look for differences that introduce or remove an instance of
<string>. Note that this is different than the string simply <string>. Note that this is different than the string simply