From: Jeff King <peff@peff.net>
To: Jay Soffian <jaysoffian@gmail.com>
Cc: git@vger.kernel.org, Junio C Hamano <junio@kernel.org>
Subject: Re: [PATCH] diff-options.txt: document --[no]-textconv
Date: Tue, 24 May 2011 15:43:23 -0400 [thread overview]
Message-ID: <20110524194322.GC584@sigill.intra.peff.net> (raw)
In-Reply-To: <1306196874-64687-1-git-send-email-jaysoffian@gmail.com>
On Mon, May 23, 2011 at 08:27:54PM -0400, Jay Soffian wrote:
> textconv also seems to be supported by blame, it isn't clear to me whether
> it respects --no-textconv.
Yeah, it should, via the regular diff option parser.
> +--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`.
It's only on by default for porcelain commands (log, show, diff).
Plumbing commands do not allow textconv unless --textconv is given.
I don't offhand recall whether it is on by default for blame.
-Peff
next prev parent reply other threads:[~2011-05-24 19:43 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-24 0:27 [PATCH] diff-options.txt: document --[no]-textconv Jay Soffian
2011-05-24 1:30 ` Junio C Hamano
2011-05-24 19:43 ` Jeff King [this message]
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=20110524194322.GC584@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=jaysoffian@gmail.com \
--cc=junio@kernel.org \
/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).