We prefer unified diffs.
Change 'context diff' -> 'unified diff' PR: docs/38728 Submitted by: Pete Zaitcev <zaitcev@yahoo.com>
This commit is contained in:
parent
f1261c55fc
commit
a2b64e362e
Notes:
svn2git
2020-12-08 03:00:23 +00:00
svn path=/head/; revision=13731
1 changed files with 3 additions and 3 deletions
|
@ -315,18 +315,18 @@ FreeBSD Entities//EN"> %freebsd;
|
|||
<para>Assuming that you can manage to secure fairly up-to-date sources
|
||||
to base your changes on, the next step is to produce a set of diffs to
|
||||
send to the FreeBSD maintainers. This is done with the &man.diff.1;
|
||||
command, with the <quote>context diff</quote> form
|
||||
command, with the <quote>unified diff</quote> form
|
||||
being preferred. For example:</para>
|
||||
|
||||
<indexterm>
|
||||
<primary><command>diff</command></primary>
|
||||
</indexterm>
|
||||
<para>
|
||||
<screen>&prompt.user; <userinput>diff -c oldfile newfile</userinput></screen>
|
||||
<screen>&prompt.user; <userinput>diff -u -c oldfile newfile</userinput></screen>
|
||||
|
||||
or
|
||||
|
||||
<screen>&prompt.user; <userinput>diff -c -r olddir newdir</userinput></screen>
|
||||
<screen>&prompt.user; <userinput>diff -u -c -r olddir newdir</userinput></screen>
|
||||
|
||||
would generate such a set of context diffs for the given
|
||||
source file or directory hierarchy. See the manual page for
|
||||
|
|
Loading…
Reference in a new issue