Skip to content

Commit d28790d

Browse files
peffgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 76c82f9 commit d28790d

File tree

1 file changed

+11
-0
lines changed

1 file changed

+11
-0
lines changed

Documentation/diff-options.txt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -416,6 +416,17 @@ endif::git-format-patch[]
416416
--no-ext-diff::
417417
Disallow external diff drivers.
418418

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+
419430
--ignore-submodules[=<when>]::
420431
Ignore changes to submodules in the diff generation. <when> can be
421432
either "none", "untracked", "dirty" or "all", which is the default

0 commit comments

Comments
 (0)