From d28790dc31ca1bcdca7254a6b9381b6c84e91271 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Wed, 6 Jul 2011 11:13:30 -0400 Subject: 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 Signed-off-by: Junio C Hamano --- Documentation/diff-options.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'Documentation/diff-options.txt') 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[=]:: Ignore changes to submodules in the diff generation. can be either "none", "untracked", "dirty" or "all", which is the default -- cgit v1.2.1