summaryrefslogtreecommitdiff
path: root/doc/contributing.texi
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2021-12-05 19:17:41 +0100
committerRicardo Wurmus <rekado@elephly.net>2021-12-05 19:17:41 +0100
commit9bc0f45df5d6aed217020b1183dca54989844fb0 (patch)
treed927e89949ff7f65b5059bc94273c53fd43d0763 /doc/contributing.texi
parent6db3c536e89deb8a204e756f427614925a7d2582 (diff)
parent10554e0a57feeea470127a1d0441957d1776b0bd (diff)
downloadguix-patches-9bc0f45df5d6aed217020b1183dca54989844fb0.tar
guix-patches-9bc0f45df5d6aed217020b1183dca54989844fb0.tar.gz
Merge remote-tracking branch 'origin/master' into core-updates-frozen
Diffstat (limited to 'doc/contributing.texi')
-rw-r--r--doc/contributing.texi7
1 files changed, 5 insertions, 2 deletions
diff --git a/doc/contributing.texi b/doc/contributing.texi
index aa6bfc2e65..db1c4c6921 100644
--- a/doc/contributing.texi
+++ b/doc/contributing.texi
@@ -1017,8 +1017,11 @@ please run through this check list:
@cindex @code{git format-patch}
@cindex @code{git-format-patch}
@item
-We recommend to use the command @code{git format-patch --base} to
-include the commit where your patch applies.
+When generating your patches with @code{git format-patch} or @code{git
+send-email}, we recommend using the option @code{--base=}, perhaps with
+the value @code{auto}. This option adds a note to the patch stating
+which commit the patch is based on. This helps reviewers understand how
+to apply and review your patches.
@item
If the authors of the packaged software provide a cryptographic