Diff - Revision history

Joergj: add mime type

2023-12-28T08:39:06Z

add mime type

Joergj: replace broken links with archived

2023-12-27T23:53:06Z

replace broken links with archived

Joergj: add more extensions

2023-12-27T23:46:18Z

add more extensions

Jsummers at 18:03, 5 October 2019

2019-10-05T18:03:37Z

Jsummers at 14:47, 21 September 2019

2019-09-21T14:47:11Z

Jsummers: /* Links */

2015-12-26T17:04:49Z

‎Links

VolodyA! V Anarhist: image

2015-06-09T05:39:26Z

image

VolodyA! V Anarhist: displaytitle

2015-06-09T05:37:02Z

displaytitle

Jsummers: /* Links */

2014-05-28T02:45:15Z

‎Links

Jsummers: Created page with "{{FormatInfo |name=diff |subcat=Archiving |extensions={{ext|patch}}, {{ext|diff}} }} '''diff''' is a family of formats associated with the traditional Unix `diff` u..."

2014-05-24T01:13:35Z

Created page with "{{FormatInfo |name=diff |subcat=Archiving |extensions={{ext|patch}}, {{ext|diff}} }} '''diff''' is a family of formats associated with the traditional Unix <code>diff</code> u..."

New page

{{FormatInfo
|name=diff
|subcat=Archiving
|extensions={{ext|patch}}, {{ext|diff}}
}}
'''diff''' is a family of formats associated with the traditional Unix <code>diff</code> utility, especially the GNU implementation of it. It encodes the differences between two files. It is often used in the form of a "patch" file that can be used to convert one file to the other.

Diff is intended for use with text files whose lines are mostly short, such as [[source code]].

== Formats ==
The <code>diff</code> utility can produce several different formats:

=== Normal diff ===
The default format, sometimes called "normal diff", contains just the differences, with no header or context.

=== Context diff ===
<code>diff -c</code> produces Context diff format. It has a header, and some contextual data that often makes it possible to patch files even after they have been modified.

It is characterized by lines with lots of asterisks:
***************

Note that the term "context diff" is sometimes used to mean "any diff format that features context" (which would include Unified diff, a different format).

=== Unified diff ===
Main article: [[Unified diff]]

<code>diff -u</code> produces Unified diff format. The idea is the same as with Context diff, but the format is more efficient and readable. It is characterized by lines that begin with "@@".

=== ed script ===
<code>diff -e</code> produces a script to be interpreted by the <code>ed</code> text editor. It was used for patch files before the introduction of the <code>patch</code> utility, but has long been obsolete for that purpose.

== Software ==
* [http://www.gnu.org/software/diffutils/ GNU Diffutils]: <code>diff</code>, <code>patch</code>

== Links ==
* [[Wikipedia:Diff|Wikipedia: Diff]]
* [http://www.gnu.org/software/diffutils/manual/html_node/Output-Formats.html GNU Diffutils manual: Output Formats]

@@ Line 3: / Line 3: @@
 |subcat=Archiving
 |extensions={{ext|patch}}, {{ext|diff}}, {{ext|pch}}<ref>https://file-extension.net/seeker/file_extension_pch</ref>, {{ext|dif}}<ref>https://file-extension.net/seeker/file_extension_dif</ref>, {{ext|rej}}<ref>https://file-extension.net/seeker/file_extension_rej</ref>
 |image=Unified diff.png
 |caption=example of unified diff

@@ Line 41: / Line 41: @@
 * [[Wikipedia:Diff utility]]
 * [http://www.gnu.org/software/diffutils/manual/html_node/Output-Formats.html GNU Diffutils manual: Output Formats]
-* [https://linuxacademy.com/blog/2012/09/18/introduction-using-diff-and-patch/ Using diff and patch]
+* [https://web.archive.org/web/20190905202025/https://linuxacademy.com/blog/linux/introduction-using-diff-and-patch/ Using diff and patch (archived)]
-* [http://jungels.net/articles/diff-patch-ten-minutes.html The Ten Minute Guide to diff and patch]
+* [https://web.archive.org/web/20151015015305/http://jungels.net/articles/diff-patch-ten-minutes.html The Ten Minute Guide to diff and patch (archived)]
 == References ==
 <references/>

@@ Line 2: / Line 2: @@
 |name=diff
 |subcat=Archiving
-|extensions={{ext|patch}}, {{ext|diff}}
+|extensions={{ext|patch}}, {{ext|diff}}, {{ext|pch}}<ref>https://file-extension.net/seeker/file_extension_pch</ref>, {{ext|dif}}<ref>https://file-extension.net/seeker/file_extension_dif</ref>, {{ext|rej}}<ref>https://file-extension.net/seeker/file_extension_rej</ref>
 |image=Unified diff.png
 |caption=example of unified diff
@@ Line 43: / Line 43: @@
 * [https://linuxacademy.com/blog/2012/09/18/introduction-using-diff-and-patch/ Using diff and patch]
 * [http://jungels.net/articles/diff-patch-ten-minutes.html The Ten Minute Guide to diff and patch]

@@ Line 7: / Line 7: @@
 }}
 {{DISPLAYTITLE:diff}}
-:''For "diff files" in general, see [[Archiving#Diff files]].''
+:''For "diff files" in general, see [[Archiving#Diff files]]. For '''Xerox DIFF''', see [[XIFF]].''
 '''diff''' is a family of formats associated with the traditional Unix <code>diff</code> utility, especially the GNU implementation of it. It encodes the differences between two files. It is often used in the form of a "patch" file that can be used to convert one file to the other.

@@ Line 7: / Line 7: @@
 }}
 {{DISPLAYTITLE:diff}}
 '''diff''' is a family of formats associated with the traditional Unix <code>diff</code> utility, especially the GNU implementation of it. It encodes the differences between two files. It is often used in the form of a "patch" file that can be used to convert one file to the other.

← Older revision		Revision as of 02:45, 28 May 2014
Line 36:		Line 36:
	* [[Wikipedia:Diff\|Wikipedia: Diff]]		* [[Wikipedia:Diff\|Wikipedia: Diff]]
	* [http://www.gnu.org/software/diffutils/manual/html_node/Output-Formats.html GNU Diffutils manual: Output Formats]		* [http://www.gnu.org/software/diffutils/manual/html_node/Output-Formats.html GNU Diffutils manual: Output Formats]
		+	* [https://linuxacademy.com/blog/2012/09/18/introduction-using-diff-and-patch/ Using diff and patch]
		+	* [http://jungels.net/articles/diff-patch-ten-minutes.html The Ten Minute Guide to diff and patch]

Diff - Revision history

Joergj: add mime type

Joergj: replace broken links with archived

Joergj: add more extensions

Jsummers at 18:03, 5 October 2019

Jsummers at 14:47, 21 September 2019

Jsummers: /* Links */

VolodyA! V Anarhist: image

VolodyA! V Anarhist: displaytitle

Jsummers: /* Links */

Jsummers: Created page with "{{FormatInfo |name=diff |subcat=Archiving |extensions={{ext|patch}}, {{ext|diff}} }} '''diff''' is a family of formats associated with the traditional Unix diff u..."

Jsummers: Created page with "{{FormatInfo |name=diff |subcat=Archiving |extensions={{ext|patch}}, {{ext|diff}} }} '''diff''' is a family of formats associated with the traditional Unix `diff` u..."