http://fileformats.archiveteam.org/index.php?action=history&feed=atom&title=Unified_diffUnified diff - Revision history2026-05-09T04:40:51ZRevision history for this page on the wikiMediaWiki 1.19.2http://fileformats.archiveteam.org/index.php?title=Unified_diff&diff=51057&oldid=prevAnonymoususer852: Indicate and provide example of git utility can be used to also generate and apply unified diff.2025-09-20T22:56:21Z<p>Indicate and provide example of git utility can be used to also generate and apply unified diff.</p>
<table class='diff diff-contentalign-left'>
<col class='diff-marker' />
<col class='diff-content' />
<col class='diff-marker' />
<col class='diff-content' />
<tr valign='top'>
<td colspan='2' style="background-color: white; color:black;">← Older revision</td>
<td colspan='2' style="background-color: white; color:black;">Revision as of 22:56, 20 September 2025</td>
</tr><tr><td colspan="2" class="diff-lineno">Line 17:</td>
<td colspan="2" class="diff-lineno">Line 17:</td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>== Software ==</div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>== Software ==</div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>* [http://www.gnu.org/software/diffutils/ GNU Diffutils]: <code>diff</code> (with <code>-u</code> option), <code>patch</code></div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>* [http://www.gnu.org/software/diffutils/ GNU Diffutils]: <code>diff</code> (with <code>-u</code> option), <code>patch</code></div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;">* [https://git-scm.com/ git]: <code>git</code> with either <code>git diff...</code>, <code>git format-patch...</code>, or <code>git log -p</code> can be used to provide unified diff</ins></div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;">** Conversely <code>git apply ...</code> can be used to apply diff or patches that were created via <code>git</code> and that the user is inside a functional git filesystem, where top directory has a folder named <code>.git</code></ins></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>== Sample files ==</div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>== Sample files ==</div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>* [http://www.gnu.org/software/diffutils/manual/html_node/Example-Unified.html Example from the GNU Diffutils manual]</div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>* [http://www.gnu.org/software/diffutils/manual/html_node/Example-Unified.html Example from the GNU Diffutils manual]</div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>* http://www.apache.org/dist/httpd/patches/ ...</div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>* http://www.apache.org/dist/httpd/patches/ ...</div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;">* [https://patch-diff.githubusercontent.com/raw/git/git/pull/6.diff Updated git-remote documentation #6 in patch/diff format - GitHub] - via inputting <code>https://github.com/git/git/pull/6.diff</code> into the address bar will make GitHub provide the pull request (PR) in a suitable patch/diff format</ins></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>== Links ==</div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>== Links ==</div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>* [[Wikipedia:Diff utility#Unified_format|Wikipedia:Diff utility]] has a section on Unified diff</div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>* [[Wikipedia:Diff utility#Unified_format|Wikipedia:Diff utility]] has a section on Unified diff</div></td></tr>
</table>Anonymoususer852http://fileformats.archiveteam.org/index.php?title=Unified_diff&diff=24033&oldid=prevJsummers: /* Links */2015-12-26T17:06:09Z<p><span dir="auto"><span class="autocomment">Links</span></span></p>
<table class='diff diff-contentalign-left'>
<col class='diff-marker' />
<col class='diff-content' />
<col class='diff-marker' />
<col class='diff-content' />
<tr valign='top'>
<td colspan='2' style="background-color: white; color:black;">← Older revision</td>
<td colspan='2' style="background-color: white; color:black;">Revision as of 17:06, 26 December 2015</td>
</tr><tr><td colspan="2" class="diff-lineno">Line 23:</td>
<td colspan="2" class="diff-lineno">Line 23:</td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>== Links ==</div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>== Links ==</div></td></tr>
<tr><td class='diff-marker'>−</td><td style="background: #ffa; color:black; font-size: smaller;"><div>* [[Wikipedia:Diff#Unified_format|Wikipedia: Diff]] has a section on Unified diff</div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div>* [[Wikipedia:Diff <ins class="diffchange diffchange-inline">utility</ins>#Unified_format|Wikipedia:Diff <ins class="diffchange diffchange-inline">utility</ins>]] has a section on Unified diff</div></td></tr>
</table>Jsummershttp://fileformats.archiveteam.org/index.php?title=Unified_diff&diff=22695&oldid=prevVolodyA! V Anarhist at 18:51, 8 June 20152015-06-08T18:51:14Z<p></p>
<table class='diff diff-contentalign-left'>
<col class='diff-marker' />
<col class='diff-content' />
<col class='diff-marker' />
<col class='diff-content' />
<tr valign='top'>
<td colspan='2' style="background-color: white; color:black;">← Older revision</td>
<td colspan='2' style="background-color: white; color:black;">Revision as of 18:51, 8 June 2015</td>
</tr><tr><td colspan="2" class="diff-lineno">Line 3:</td>
<td colspan="2" class="diff-lineno">Line 3:</td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>|extensions={{ext|patch}}, {{ext|diff}}</div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>|extensions={{ext|patch}}, {{ext|diff}}</div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>|released=1991</div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>|released=1991</div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;">|image=Unified diff.png</ins></div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;">|caption=Unified diff example</ins></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>}}</div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>}}</div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>'''Unified diff''' (or '''diff unified format''', '''unified context diff''', '''unidiff''') is a [[diff]] format commonly used for patch files.</div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>'''Unified diff''' (or '''diff unified format''', '''unified context diff''', '''unidiff''') is a [[diff]] format commonly used for patch files.</div></td></tr>
</table>VolodyA! V Anarhisthttp://fileformats.archiveteam.org/index.php?title=Unified_diff&diff=17568&oldid=prevJsummers: Created page with "{{FormatInfo |subcat=Archiving |extensions={{ext|patch}}, {{ext|diff}} |released=1991 }} '''Unified diff''' (or '''diff unified format''', '''unified context diff''', '''unidi..."2014-05-24T01:16:37Z<p>Created page with "{{FormatInfo |subcat=Archiving |extensions={{ext|patch}}, {{ext|diff}} |released=1991 }} '''Unified diff''' (or '''diff unified format''', '''unified context diff''', '''unidi..."</p>
<p><b>New page</b></p><div>{{FormatInfo<br />
|subcat=Archiving<br />
|extensions={{ext|patch}}, {{ext|diff}}<br />
|released=1991<br />
}}<br />
'''Unified diff''' (or '''diff unified format''', '''unified context diff''', '''unidiff''') is a [[diff]] format commonly used for patch files.<br />
<br />
== Identification ==<br />
Unlike other diff formats, Unified diff has lines that begin with "@@".<br />
<br />
== Specifications ==<br />
* [http://www.artima.com/weblogs/viewpost.jsp?thread=164293 Unified Diff Format] - Ad-hoc specification by Guido van Rossum<br />
* [http://www.gnu.org/software/diffutils/manual/html_node/Detailed-Unified.html GNU Diffutilis manual: Detailed Description of Unified Format]<br />
<br />
== Software ==<br />
* [http://www.gnu.org/software/diffutils/ GNU Diffutils]: <code>diff</code> (with <code>-u</code> option), <code>patch</code><br />
<br />
== Sample files ==<br />
* [http://www.gnu.org/software/diffutils/manual/html_node/Example-Unified.html Example from the GNU Diffutils manual]<br />
* http://www.apache.org/dist/httpd/patches/ ...<br />
<br />
== Links ==<br />
* [[Wikipedia:Diff#Unified_format|Wikipedia: Diff]] has a section on Unified diff</div>Jsummers