From 49bd30eb33e54081b11255a2862cea78278c6c27 Mon Sep 17 00:00:00 2001 From: est31 Date: Sun, 6 Jun 2021 21:39:14 +0200 Subject: [PATCH] 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. --- doc/contributing/coding-conventions.chapter.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/contributing/coding-conventions.chapter.md b/doc/contributing/coding-conventions.chapter.md index 1eaa06a659d5..8022213a656d 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`: