From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Dakota Hawkins <dakota@dakotahawkins.com>, Git <git@vger.kernel.org>
Subject: Re: .gitattributes override behavior (possible bug, or documentation bug)
Date: Mon, 19 Mar 2018 23:45:46 -0400 [thread overview]
Message-ID: <20180320034545.GA12938@sigill.intra.peff.net> (raw)
In-Reply-To: <xmqq8tanto90.fsf@gitster-ct.c.googlers.com>
On Mon, Mar 19, 2018 at 08:33:15PM -0700, Junio C Hamano wrote:
> Jeff King <peff@peff.net> writes:
>
> > The best you can probably do is:
> >
> > /.readme-docs/* diff=foo
> >
> > Since you have no diff.foo.* config, that will behave in the default way
> > (including respecting the usual "is it binary" checks). So a bit hacky,
> > but I think it would work as "ignore prior diff".
>
> You can say
>
> /.readme-docs/* !diff
>
> I think. Thre is a difference between setting it to "false"
> (i.e. Unset) and reverting it to unspecified state.
>
> Isn't that what you want here?
Ah, yes, I totally forgot that existed. That's much better than the
hackery I proposed.
-Peff
prev parent reply other threads:[~2018-03-20 3:45 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-20 1:49 .gitattributes override behavior (possible bug, or documentation bug) Dakota Hawkins
2018-03-20 2:34 ` Jeff King
2018-03-20 3:10 ` Dakota Hawkins
2018-03-20 3:17 ` Dakota Hawkins
2018-03-20 4:12 ` Jeff King
2018-03-20 4:04 ` Jeff King
2018-03-20 4:14 ` [PATCH] doc/gitattributes: mention non-recursive behavior Jeff King
2018-03-20 4:28 ` Dakota Hawkins
2018-03-20 16:41 ` Duy Nguyen
2018-03-21 6:50 ` Jeff King
2018-03-21 16:16 ` Duy Nguyen
2018-03-23 9:12 ` Jeff King
2018-03-20 4:25 ` .gitattributes override behavior (possible bug, or documentation bug) Dakota Hawkins
2018-03-20 4:40 ` Jeff King
2018-03-20 4:49 ` Dakota Hawkins
2018-03-20 16:28 ` Duy Nguyen
2018-03-21 3:22 ` Dakota Hawkins
2018-03-21 6:52 ` Jeff King
2018-03-21 7:36 ` Dakota Hawkins
2018-03-21 7:44 ` Dakota Hawkins
2018-03-21 7:50 ` Jeff King
2018-03-21 8:35 ` Dakota Hawkins
2018-03-21 8:36 ` Jeff King
2018-03-21 16:18 ` Junio C Hamano
2018-03-21 16:07 ` Duy Nguyen
2018-03-20 3:33 ` Junio C Hamano
2018-03-20 3:40 ` Dakota Hawkins
2018-03-20 3:45 ` Jeff King [this message]
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180320034545.GA12938@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=dakota@dakotahawkins.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).