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>
Yann Dirson committed
Nov 10, 2010 at 21:27 UTC
f1037448e29104cdad73b93cb961e3b40e08e925
1 file changed
+12
-14
Documentation/diff-options.txt
+12
-14
@@ -247,20 +247,6 @@ endif::git-log[]
247
Detect copies as well as renames. See also `--find-copies-harder`.
248
If `n` is specified, it has the same meaning as for `-M<n>`.
249
250
-ifndef::git-format-patch[]
251
---diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]::
252
- Select only files that are Added (`A`), Copied (`C`),
253
- Deleted (`D`), Modified (`M`), Renamed (`R`), have their
254
- type (i.e. regular file, symlink, submodule, ...) changed (`T`),
255
- are Unmerged (`U`), are
256
- Unknown (`X`), or have had their pairing Broken (`B`).
257
- Any combination of the filter characters (including none) can be used.
258
- When `*` (All-or-none) is added to the combination, all
259
- paths are selected if there is any file that matches
260
- other criteria in the comparison; if there is no file
261
- that matches other criteria, nothing is selected.
262
-endif::git-format-patch[]
263
-
250
--find-copies-harder::
251
For performance reasons, by default, `-C` option finds copies only
252
if the original file of the copy was modified in the same
@@ -278,6 +264,18 @@ endif::git-format-patch[]
264
number.
265
266
ifndef::git-format-patch[]
267
+--diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]::
268
+ Select only files that are Added (`A`), Copied (`C`),
269
+ Deleted (`D`), Modified (`M`), Renamed (`R`), have their
270
+ type (i.e. regular file, symlink, submodule, ...) changed (`T`),
271
+ are Unmerged (`U`), are
272
+ Unknown (`X`), or have had their pairing Broken (`B`).
273
+ Any combination of the filter characters (including none) can be used.
274
+ When `*` (All-or-none) is added to the combination, all
275
+ paths are selected if there is any file that matches
276
+ other criteria in the comparison; if there is no file
277
+ that matches other criteria, nothing is selected.
278
+
279
-S<string>::
280
Look for differences that introduce or remove an instance of
281
<string>. Note that this is different than the string simply