kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'maint' 

* maint:
  docs: document --textconv diff option
maint
Junio C Hamano 2011-07-06 16:48:59 -07:00
parent 9901923cf0 d28790dc31
commit 395f65d438
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Documentation/diff-options.txt
View File

@ -422,6 +422,17 @@ endif::git-format-patch[]
--no-ext-diff:: --no-ext-diff::
Disallow external diff drivers. 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-submodules[=<when>]::
Ignore changes to submodules in the diff generation. <when> can be Ignore changes to submodules in the diff generation. <when> can be
either "none", "untracked", "dirty" or "all", which is the default either "none", "untracked", "dirty" or "all", which is the default