diff options
| author | Junio C Hamano <junio@kernel.org> | 2011-07-07 01:14:31 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2011-07-07 01:14:31 +0000 |
| commit | c652aed8923d6b63b98c910666b861a766217891 (patch) | |
| tree | b15611fd594690a38dc8e014e41874dd6ed09662 /diff-options.txt | |
| parent | 4c4b012f8e2199a3fa817a0d95bbde69a0fb1c4b (diff) | |
| download | git-htmldocs-c652aed8923d6b63b98c910666b861a766217891.tar.gz | |
Autogenerated HTML docs for v1.7.6-134-gcf13f
Diffstat (limited to 'diff-options.txt')
| -rw-r--r-- | diff-options.txt | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/diff-options.txt b/diff-options.txt index 4235302ea..b620b3afe 100644 --- a/diff-options.txt +++ b/diff-options.txt @@ -422,6 +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 |