History log of /freebsd-12.1/usr.bin/diff/diff.1 (Results 1 – 11 of 11)
Revision (<<< Hide revision tags) (Show revision tags >>>) Date Author Comments
Revision tags: release/12.2.0, release/11.4.0, release/12.1.0, release/11.3.0, release/12.0.0
# e68edb8c 19-Aug-2018 Kyle Evans <[email protected]>

diff(1): Implement -B/--ignore-blank-lines

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 G

diff(1): Implement -B/--ignore-blank-lines

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

show more ...


Revision tags: release/11.2.0, release/10.4.0, release/11.1.0
# 933870f0 20-Apr-2017 Baptiste Daroussin <[email protected]>

Cross reference pr(1) which diff might call with -l option


# bcf91ad6 20-Apr-2017 Baptiste Daroussin <[email protected]>

Document all long options


# fddcb7b8 20-Apr-2017 Baptiste Daroussin <[email protected]>

Implement a basic --changed-group-format

etcupdate(8) requires that option, while GNU diff supports many more variation
of that options, their behaviour beside the simple verion implemented here are

Implement a basic --changed-group-format

etcupdate(8) requires that option, while GNU diff supports many more variation
of that options, their behaviour beside the simple verion implemented here are
quite inconsistent as such I do not plan to implement those.

The only special keyword supported by this implementation are: %< and %>
%= is not implemented as the documentation of GNU diff says: common lines, but
it actually when tested print the changes from the first file

show more ...


# a077708d 08-Apr-2017 Baptiste Daroussin <[email protected]>

add a stub --speed-large-files for compatibility with GNU diff

There is no intention to implement it, but lots of scripts/tools using
diff(1) passes GNU diff option


# 7dacb9e7 23-Mar-2017 Enji Cooper <[email protected]>

diff(1): document remaining long options

While here, try and tie together some of the short options with
their long option equivalents, where possible.

Sponsored by: Dell EMC Isilon


# 78b83a1e 22-Mar-2017 Enji Cooper <[email protected]>

diff(1): fix SYNOPSIS section noting non-existent option, --no-ignore-case

`--no-ignore-case` should be `--no-ignore-file-name-case` per code for
compatibility with [g]diff(1).

Sponsored by: Dell E

diff(1): fix SYNOPSIS section noting non-existent option, --no-ignore-case

`--no-ignore-case` should be `--no-ignore-file-name-case` per code for
compatibility with [g]diff(1).

Sponsored by: Dell EMC Isilon

show more ...


# 9ba27624 19-Mar-2017 Enji Cooper <[email protected]>

diff(1): add --strip-trailing-cr to last example in the SYNOPSIS

This syncs the last example in the SYNOPSIS with the other examples.

Reviewed by: bapt
Sponsored by: Dell EMC Isilon
Differential Re

diff(1): add --strip-trailing-cr to last example in the SYNOPSIS

This syncs the last example in the SYNOPSIS with the other examples.

Reviewed by: bapt
Sponsored by: Dell EMC Isilon
Differential Revision: D10017

show more ...


# b7ea08a9 15-Mar-2017 Enji Cooper <[email protected]>

diff(1): sort long options under -D example in SYNOPSYS

Sponsored by: Dell EMC Isilon


# 57f942af 12-Mar-2017 Baptiste Daroussin <[email protected]>

Fix wrong date in diff(1)

Reported by: rgrimes


# 3bbe3f67 11-Mar-2017 Baptiste Daroussin <[email protected]>

Import diff from OpenBSD and remove GNU diff

Some of the modifications from the previous summer of code has been integrated
Modification for compatibility with GNU diff output has been added

Main d

Import diff from OpenBSD and remove GNU diff

Some of the modifications from the previous summer of code has been integrated
Modification for compatibility with GNU diff output has been added

Main difference with OpenBSD:
Implement multiple GNU diff options:
* --ignore-file-name-case
* --no-ignore-file-name-case
* --normal
* --tabsize
* --strip-trailing-cr
Make diff -p compatible with GNU diff
Implement diff -l
Make diff -r compatible with GNU diff

Capsicumize diffing 2 regular files
Add a simple test suite

Approved by: AsiaBSDcon devsummit
Obtained from: OpenBSD, GSoC
Relnotes: yes

show more ...