Merge branch 'maint'

* maint:
docs: document --textconv diff option

diff --combined Documentation/diff-options.txt
index 4235302ea48eea4daac9512f680fc4cfd877fb23,659de6f12384239f58dc688797db8dbb10420143..b620b3afeca14166840fb76b4cefe1e4038fb47e
--- 1/Documentation/diff-options.txt
--- 2/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@@ -48,17 -48,11 +48,17 @@@ endif::git-format-patch[
  --patience::
        Generate a diff using the "patience diff" algorithm.
  
 ---stat[=<width>[,<name-width>]]::
 +--stat[=<width>[,<name-width>[,<count>]]]::
        Generate a diffstat.  You can override the default
        output width for 80-column terminal by `--stat=<width>`.
        The width of the filename part can be controlled by
        giving another width to it separated by a comma.
 +      By giving a third parameter `<count>`, you can limit the
 +      output to the first `<count>` lines, followed by
 +      `...` if there are more.
 ++
 +These parameters can also be set individually with `--stat-width=<width>`,
 +`--stat-name-width=<name-width>` and `--stat-count=<count>`.
  
  --numstat::
        Similar to `\--stat`, but shows number of added and
@@@ -422,6 -416,17 +422,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