In message <[EMAIL PROTECTED]>, Michael Lucas writes:
>Hello,
>
>I'm afraid I might be walking up to a bikeshed with a can of paint
>here, but the flood of email in the last twenty-four hours has
>convinced me to ask.
>
>In an article O'Reilly published yesterday, I stated (per the
>Handbook) that context diffs were the correct way to submit patches
>with PRs.  I've had several people claim that unified diffs are the
>way to go, and that the handbook is just wrong.

Unified diffs are also context diffs.

Context diffs are named such because they contain undisturbed context
around the changed lines, unlike normal diffs.

Unified diffs are generally smaller than "plain" context diffs, and
some people find them more readable and some don't.

--
Poul-Henning Kamp       | UNIX since Zilog Zeus 3.20
[EMAIL PROTECTED]         | TCP/IP since RFC 956
FreeBSD committer       | BSD since 4.3-tahoe    
Never attribute to malice what can adequately be explained by incompetence.

To Unsubscribe: send mail to [EMAIL PROTECTED]
with "unsubscribe freebsd-hackers" in the body of the message

Reply via email to