diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-07-06 16:48:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-07-06 16:48:59 -0700 |
| commit | 395f65d438b13fb1fded88a330dc06c3b0951046 (patch) | |
| tree | e7a2d4e7845eb1349de59aa07c5d9c6455f5263d /Documentation/diff-options.txt | |
| parent | Merge branch 'jc/streaming-filter' into next (diff) | |
| parent | docs: document --textconv diff option (diff) | |
| download | tgif-395f65d438b13fb1fded88a330dc06c3b0951046.tar.xz | |
Merge branch 'maint'
* maint:
docs: document --textconv diff option
Diffstat (limited to 'Documentation/diff-options.txt')
| -rw-r--r-- | Documentation/diff-options.txt | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 4235302ea4..b620b3afec 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/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 |