<feed xmlns='http://www.w3.org/2005/Atom'>
<title>src/usr.bin/diff/diff.1, branch releng/13.5</title>
<subtitle>FreeBSD source tree</subtitle>
<id>https://cgit-dev.freebsd.org/src/atom?h=releng%2F13.5</id>
<link rel='self' href='https://cgit-dev.freebsd.org/src/atom?h=releng%2F13.5'/>
<link rel='alternate' type='text/html' href='https://cgit-dev.freebsd.org/src/'/>
<updated>2024-08-01T16:43:02Z</updated>
<entry>
<title>diff: Fix usage message and documentation.</title>
<updated>2024-08-01T16:43:02Z</updated>
<author>
<name>Dag-Erling Smørgrav</name>
<email>des@FreeBSD.org</email>
</author>
<published>2024-07-29T14:02:21Z</published>
<link rel='alternate' type='text/html' href='https://cgit-dev.freebsd.org/src/commit/?id=ae8b85ac11257f1166dfe25c354bf0d4bd64b98d'/>
<id>urn:sha1:ae8b85ac11257f1166dfe25c354bf0d4bd64b98d</id>
<content type='text'>
The `--ignore-all-space` option was incorrectly documented as
`--ignore-all-blanks` in some (but not all) places.

MFC after:	3 days
PR:		280434
Sponsored by:	Klara, Inc.
Reviewed by:	0mp, markj
Differential Revision:	https://reviews.freebsd.org/D46160

(cherry picked from commit ab830de9f58c1b257e42b4fbdd46b3ca6a837ee6)
</content>
</entry>
<entry>
<title>Remove $FreeBSD$: one-line nroff pattern</title>
<updated>2023-08-23T17:43:32Z</updated>
<author>
<name>Warner Losh</name>
<email>imp@FreeBSD.org</email>
</author>
<published>2023-08-22T01:32:13Z</published>
<link rel='alternate' type='text/html' href='https://cgit-dev.freebsd.org/src/commit/?id=24115b70d6d614ed7ac5cfc4f51fa9d6cfe8b1b2'/>
<id>urn:sha1:24115b70d6d614ed7ac5cfc4f51fa9d6cfe8b1b2</id>
<content type='text'>
Remove /^\.\\"\s*\$FreeBSD\$$\n/

Similar commit in main:
(cherry picked from commit b2c76c41be32)
</content>
</entry>
<entry>
<title>diff(1): Add EXAMPLES section</title>
<updated>2020-06-19T06:48:16Z</updated>
<author>
<name>Fernando Apesteguía</name>
<email>fernape@FreeBSD.org</email>
</author>
<published>2020-06-19T06:48:16Z</published>
<link rel='alternate' type='text/html' href='https://cgit-dev.freebsd.org/src/commit/?id=204fa3b0669788bbd054f3faf4ea6b7ea0ae4d5b'/>
<id>urn:sha1:204fa3b0669788bbd054f3faf4ea6b7ea0ae4d5b</id>
<content type='text'>
Add examples for -r, -u, -N, -x, -q and -I

Approved by:	0mp@
Differential Revision:	https://reviews.freebsd.org/D25345
</content>
</entry>
<entry>
<title>Document long version of -b option</title>
<updated>2020-06-01T09:15:15Z</updated>
<author>
<name>Baptiste Daroussin</name>
<email>bapt@FreeBSD.org</email>
</author>
<published>2020-06-01T09:15:15Z</published>
<link rel='alternate' type='text/html' href='https://cgit-dev.freebsd.org/src/commit/?id=8ccef193957e7ca9ec28f8a7e630dae7344691dd'/>
<id>urn:sha1:8ccef193957e7ca9ec28f8a7e630dae7344691dd</id>
<content type='text'>
PR:		234195
Submitted by:	Fehmi Noyan Isi &lt;fnoyanisi@yahoo.com&gt;
Reported by:	Andras Farkas &lt;deepbluemistake@gmail.com&gt;
MFC after:	3 days
</content>
</entry>
<entry>
<title>diff: fix segfault with --tabsize and no/malformed argument</title>
<updated>2020-02-13T20:23:55Z</updated>
<author>
<name>Kyle Evans</name>
<email>kevans@FreeBSD.org</email>
</author>
<published>2020-02-13T20:23:55Z</published>
<link rel='alternate' type='text/html' href='https://cgit-dev.freebsd.org/src/commit/?id=43fbd654516eb5ddfa2994d92b7dfd373192796e'/>
<id>urn:sha1:43fbd654516eb5ddfa2994d92b7dfd373192796e</id>
<content type='text'>
--tabsize was previously listed as optional_argument, but didn't account for
the optionality of it in the argument handling. This is irrelevant -- the
manpage doesn't indicate that the argument is optional, and indeed there's
no clear interpretation of omitting the argument because there's no other
side effect of --tabsize.

The "malformed" argument part of the header on this message is simply
referring to usage like this:

% diff --tabsize 4 A B

With an optional_argument, the argument must be attached to the parameter
directly (e.g. --tabsize=4), so the argument is effectively NULL with the
above invocation as if no argument had been passed.

PR:		243974
Submitted by:	fehmi noyan isi &lt;fnoyanisi yahoo com&gt; (diff.c portion)
MFC after:	3 days
</content>
</entry>
<entry>
<title>diff.1: Fix style &amp; document -y as extension to POSIX</title>
<updated>2020-02-12T20:06:41Z</updated>
<author>
<name>Mateusz Piotrowski</name>
<email>0mp@FreeBSD.org</email>
</author>
<published>2020-02-12T20:06:41Z</published>
<link rel='alternate' type='text/html' href='https://cgit-dev.freebsd.org/src/commit/?id=469635f600190be2bd0f95776196cb33d01c71bd'/>
<id>urn:sha1:469635f600190be2bd0f95776196cb33d01c71bd</id>
<content type='text'>
- Long options must be stylized with the Fl macro as well.

Reviewed by:	bapt
Approved by:	bcr (mentor)
Differential Revision:	https://reviews.freebsd.org/D23642
</content>
</entry>
<entry>
<title>Fix most of the style warnings</title>
<updated>2020-02-07T12:26:38Z</updated>
<author>
<name>Baptiste Daroussin</name>
<email>bapt@FreeBSD.org</email>
</author>
<published>2020-02-07T12:26:38Z</published>
<link rel='alternate' type='text/html' href='https://cgit-dev.freebsd.org/src/commit/?id=79208b1025f3a99aea828109b5423a62be3f87b0'/>
<id>urn:sha1:79208b1025f3a99aea828109b5423a62be3f87b0</id>
<content type='text'>
</content>
</entry>
<entry>
<title>diff: implement -y (--side-by-side) along with -W and --suppress-common-lines</title>
<updated>2020-02-07T10:17:13Z</updated>
<author>
<name>Baptiste Daroussin</name>
<email>bapt@FreeBSD.org</email>
</author>
<published>2020-02-07T10:17:13Z</published>
<link rel='alternate' type='text/html' href='https://cgit-dev.freebsd.org/src/commit/?id=64793e748cfa3a3d753631a13b6ef212cd645358'/>
<id>urn:sha1:64793e748cfa3a3d753631a13b6ef212cd645358</id>
<content type='text'>
PR:		219933
Submitted by:	fehmi noyan isi &lt;fnoyanisi@yahoo.com&gt;
MFC after:	3 weeks
</content>
</entry>
<entry>
<title>diff(1): Implement -B/--ignore-blank-lines</title>
<updated>2018-08-19T03:57:20Z</updated>
<author>
<name>Kyle Evans</name>
<email>kevans@FreeBSD.org</email>
</author>
<published>2018-08-19T03:57:20Z</published>
<link rel='alternate' type='text/html' href='https://cgit-dev.freebsd.org/src/commit/?id=e68edb8cf06a796453378b98d963692c838c400f'/>
<id>urn:sha1:e68edb8cf06a796453378b98d963692c838c400f</id>
<content type='text'>
As noted by cem in r338035, coccinelle invokes diff(1) with the -B flag.
This was not previously implemented here, so one was forced to create a link
for GNU diff to /usr/local/bin/diff

Implement the -B flag and add some primitive tests for it. It is implemented
in the same fashion that -I is implemented; each chunk's lines are scanned,
and if a non-blank line is encountered then the chunk will be output.
Otherwise, it's skipped.

MFC after:	2 weeks
</content>
</entry>
<entry>
<title>Cross reference pr(1) which diff might call with -l option</title>
<updated>2017-04-20T19:14:52Z</updated>
<author>
<name>Baptiste Daroussin</name>
<email>bapt@FreeBSD.org</email>
</author>
<published>2017-04-20T19:14:52Z</published>
<link rel='alternate' type='text/html' href='https://cgit-dev.freebsd.org/src/commit/?id=933870f0d15022c5b0fe67b07d0a905a36c8bee8'/>
<id>urn:sha1:933870f0d15022c5b0fe67b07d0a905a36c8bee8</id>
<content type='text'>
</content>
</entry>
</feed>
