From 22ec08d7b76709750f8c9a8aaf7e86703e4eb56c Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Sun, 1 Nov 2015 14:41:29 +0000 Subject: [PATCH] Clarify the preferred way of creating patch files Clarify that git format-patch output is preferred for creating patch files. Reviewed-by: Richard Levitte (cherry picked from commit f89ee71bc81017e04ac50f570d8aed87f495bcf2) --- CONTRIBUTING | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING b/CONTRIBUTING index 1d46f7bbaa..9d63d8abb6 100644 --- a/CONTRIBUTING +++ b/CONTRIBUTING @@ -22,8 +22,14 @@ current Git or the last snapshot. They should follow our coding style warnings using the --strict-warnings flag. OpenSSL compiles on many varied platforms: try to ensure you only use portable features. -Our preferred format for changes is "diff -u" output. One method is to use -"git diff" Another is to generate it something like this: +Our preferred format for patch files is "git format-patch" output. For example +to provide a patch file containing the last commit in your local git repository +use the following command: + +# git format-patch --stdout HEAD^ >mydiffs.patch + +Another method of creating an acceptable patch file without using git is as +follows: # cd openssl-work # [your changes] -- 2.25.1