From: Jay Soffian <jaysoffian@gmail.com>
To: git@vger.kernel.org
Cc: Jay Soffian <jaysoffian@gmail.com>, Jeff King <peff@peff.net>,
Junio C Hamano <junio@kernel.org>
Subject: [PATCH] diff-options.txt: document --[no]-textconv
Date: Mon, 23 May 2011 20:27:54 -0400 [thread overview]
Message-ID: <1306196874-64687-1-git-send-email-jaysoffian@gmail.com> (raw)
Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
---
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[=<when>]::
Ignore changes to submodules in the diff generation. <when> can be
either "none", "untracked", "dirty" or "all", which is the default
--
1.7.5.2.323.g00f3d
next reply other threads:[~2011-05-24 0:28 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-24 0:27 Jay Soffian [this message]
2011-05-24 1:30 ` [PATCH] diff-options.txt: document --[no]-textconv Junio C Hamano
2011-05-24 19:43 ` Jeff King
2011-05-24 19:45 ` [PATCH] doc: discuss textconv versus external diff drivers Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1306196874-64687-1-git-send-email-jaysoffian@gmail.com \
--to=jaysoffian@gmail.com \
--cc=git@vger.kernel.org \
--cc=junio@kernel.org \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).