diff options
| author | est31 <MTest31@outlook.com> | 2021-06-06 21:39:14 +0200 |
|---|---|---|
| committer | est31 <MTest31@outlook.com> | 2021-06-06 21:45:57 +0200 |
| commit | 49bd30eb33e54081b11255a2862cea78278c6c27 (patch) | |
| tree | 77752a0cf8b95f26fb7689a0e26c3ac97fb7dc45 /doc | |
| parent | 690496c4e545e68482b5c162a03f0a4f97d35373 (diff) | |
| download | nixpkgs-49bd30eb33e54081b11255a2862cea78278c6c27.tar nixpkgs-49bd30eb33e54081b11255a2862cea78278c6c27.tar.gz nixpkgs-49bd30eb33e54081b11255a2862cea78278c6c27.tar.bz2 nixpkgs-49bd30eb33e54081b11255a2862cea78278c6c27.tar.lz nixpkgs-49bd30eb33e54081b11255a2862cea78278c6c27.tar.xz nixpkgs-49bd30eb33e54081b11255a2862cea78278c6c27.tar.zst nixpkgs-49bd30eb33e54081b11255a2862cea78278c6c27.zip | |
Add the -a param to the docs
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.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/contributing/coding-conventions.chapter.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/contributing/coding-conventions.chapter.md b/doc/contributing/coding-conventions.chapter.md index 1eaa06a659d..8022213a656 100644 --- a/doc/contributing/coding-conventions.chapter.md +++ b/doc/contributing/coding-conventions.chapter.md @@ -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: ```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`: |