aboutsummaryrefslogtreecommitdiff
path: root/Documentation/diff-options.txt
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2011-07-06 11:13:30 -0400
committerJunio C Hamano <gitster@pobox.com>2011-07-06 11:10:11 -0700
commitd28790dc31ca1bcdca7254a6b9381b6c84e91271 (patch)
tree290988244cf5eb56978a632433bb6eb61b42352b /Documentation/diff-options.txt
parent76c82f90abde8820461e042c6654673f1147881d (diff)
downloadgit-d28790dc31ca1bcdca7254a6b9381b6c84e91271.tar.gz
git-d28790dc31ca1bcdca7254a6b9381b6c84e91271.tar.xz
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>
Diffstat (limited to 'Documentation/diff-options.txt')
-rw-r--r--Documentation/diff-options.txt11
1 files changed, 11 insertions, 0 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 24f189f96..659de6f12 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -416,6 +416,17 @@ endif::git-format-patch[]
--no-ext-diff::
Disallow external diff drivers.
+--textconv::
+--no-textconv::
+ Allow (or disallow) external text conversion filters to be run
+ when comparing binary files. See linkgit:gitattributes[5] for
+ details. Because textconv filters are typically a one-way
+ conversion, the resulting diff is suitable for human
+ consumption, but cannot be applied. For this reason, textconv
+ filters are enabled by default only for linkgit:git-diff[1] and
+ linkgit:git-log[1], but not for linkgit:git-format-patch[1] or
+ diff plumbing commands.
+
--ignore-submodules[=<when>]::
Ignore changes to submodules in the diff generation. <when> can be
either "none", "untracked", "dirty" or "all", which is the default