From: Jay Soffian Date: Tue, 24 May 2011 00:27:54 GMT Subject: [PATCH] diff-options.txt: document --[no]-textconv Message-ID: <1306196874-64687-1-git-send-email-jaysoffian@gmail.com> Signed-off-by: Jay Soffian --- textconv also seems to be supported by blame, it isn't clear to me whether it respects --no-textconv. Documentation/diff-options.txt | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index c7ed946357..8b311a60ea 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -412,6 +412,15 @@ endif::git-format-patch[] --no-ext-diff:: Disallow external diff drivers. +--textconv:: + Text conversion of binary files is enabled by default if configured + according to "Performing text diffs of binary files" in + linkgit:gitattributes[5], but may be disabled with `--no-textconv`. + This option overrides a previously given `--no-textconv`. + +--no-textconv:: + Disable text conversion of binary files. + --ignore-submodules[=]:: Ignore changes to submodules in the diff generation. can be either "none", "untracked", "dirty" or "all", which is the default -- 1.7.5.2.323.g00f3d