JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add the -a param to the docs

Browse Source 
The patch utility does not understand git formatted patches.
For text files, there is no problem, but binary files use the
git format.

The -a param makes git diff put binary files into the patch in
raw format that can be understood by the patch tool.
This commit is contained in:
est31 2021-06-06 21:39:14 +02:00
parent 690496c4e5
commit 49bd30eb33
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/contributing/coding-conventions.chapter.md
View File

@ -520,7 +520,7 @@ If you do need to do create this sort of patch file, one way to do so is with gi
4. Use git to create a diff, and pipe the output to a patch file: 4. Use git to create a diff, and pipe the output to a patch file:
```ShellSession ```ShellSession
$ git diff > nixpkgs/pkgs/the/package/0001-changes.patch $ git diff -a > nixpkgs/pkgs/the/package/0001-changes.patch
``` ```
If a patch is available online but does not cleanly apply, it can be modified in some fixed ways by using additional optional arguments for `fetchpatch`: If a patch is available online but does not cleanly apply, it can be modified in some fixed ways by using additional optional arguments for `fetchpatch`: