Unified diff
From Just Solve the File Format Problem
(Difference between revisions)
(Created page with "{{FormatInfo |subcat=Archiving |extensions={{ext|patch}}, {{ext|diff}} |released=1991 }} '''Unified diff''' (or '''diff unified format''', '''unified context diff''', '''unidi...") |
(Indicate and provide example of git utility can be used to also generate and apply unified diff.) |
||
| (2 intermediate revisions by 2 users not shown) | |||
| Line 3: | Line 3: | ||
|extensions={{ext|patch}}, {{ext|diff}} | |extensions={{ext|patch}}, {{ext|diff}} | ||
|released=1991 | |released=1991 | ||
| + | |image=Unified diff.png | ||
| + | |caption=Unified diff example | ||
}} | }} | ||
'''Unified diff''' (or '''diff unified format''', '''unified context diff''', '''unidiff''') is a [[diff]] format commonly used for patch files. | '''Unified diff''' (or '''diff unified format''', '''unified context diff''', '''unidiff''') is a [[diff]] format commonly used for patch files. | ||
| Line 15: | Line 17: | ||
== Software == | == Software == | ||
* [http://www.gnu.org/software/diffutils/ GNU Diffutils]: <code>diff</code> (with <code>-u</code> option), <code>patch</code> | * [http://www.gnu.org/software/diffutils/ GNU Diffutils]: <code>diff</code> (with <code>-u</code> option), <code>patch</code> | ||
| + | * [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 | ||
| + | ** 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> | ||
== Sample files == | == Sample files == | ||
* [http://www.gnu.org/software/diffutils/manual/html_node/Example-Unified.html Example from the GNU Diffutils manual] | * [http://www.gnu.org/software/diffutils/manual/html_node/Example-Unified.html Example from the GNU Diffutils manual] | ||
* http://www.apache.org/dist/httpd/patches/ ... | * http://www.apache.org/dist/httpd/patches/ ... | ||
| + | * [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 | ||
== Links == | == Links == | ||
| − | * [[Wikipedia:Diff#Unified_format|Wikipedia: Diff]] has a section on Unified diff | + | * [[Wikipedia:Diff utility#Unified_format|Wikipedia:Diff utility]] has a section on Unified diff |
Latest revision as of 22:56, 20 September 2025
Unified diff (or diff unified format, unified context diff, unidiff) is a diff format commonly used for patch files.
Contents |
[edit] Identification
Unlike other diff formats, Unified diff has lines that begin with "@@".
[edit] Specifications
- Unified Diff Format - Ad-hoc specification by Guido van Rossum
- GNU Diffutilis manual: Detailed Description of Unified Format
[edit] Software
- GNU Diffutils:
diff(with-uoption),patch - git:
gitwith eithergit diff...,git format-patch..., orgit log -pcan be used to provide unified diff- Conversely
git apply ...can be used to apply diff or patches that were created viagitand that the user is inside a functional git filesystem, where top directory has a folder named.git
- Conversely
[edit] Sample files
- Example from the GNU Diffutils manual
- http://www.apache.org/dist/httpd/patches/ ...
- Updated git-remote documentation #6 in patch/diff format - GitHub - via inputting
https://github.com/git/git/pull/6.diffinto the address bar will make GitHub provide the pull request (PR) in a suitable patch/diff format
[edit] Links
- Wikipedia:Diff utility has a section on Unified diff
