docs: document --textconv diff option
This has been there since textconv existed, but was never documented. There is some overlap with what's in gitattributes(5), but it's important to warn in both places that textconv diffs probably can't be applied. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Jul 6, 2011 at 11:13 UTC
d28790dc31ca1bcdca7254a6b9381b6c84e91271
1 file changed
+11
Documentation/diff-options.txt
+11
@@ -416,6 +416,17 @@ endif::git-format-patch[]
416
--no-ext-diff::
417
Disallow external diff drivers.
418
419
+--textconv::
420
+--no-textconv::
421
+ Allow (or disallow) external text conversion filters to be run
422
+ when comparing binary files. See linkgit:gitattributes[5] for
423
+ details. Because textconv filters are typically a one-way
424
+ conversion, the resulting diff is suitable for human
425
+ consumption, but cannot be applied. For this reason, textconv
426
+ filters are enabled by default only for linkgit:git-diff[1] and
427
+ linkgit:git-log[1], but not for linkgit:git-format-patch[1] or
428
+ diff plumbing commands.
429
+
430
--ignore-submodules[=<when>]::
431
Ignore changes to submodules in the diff generation. <when> can be
432
either "none", "untracked", "dirty" or "all", which is the default