Robert> The thing thatʼs missing is any discussion of how to ensure the
Author
Robert> of the commit is set correctly. When applying git patches it all
Robert> works, but not when applying diffs. Iʼll read through the
Robert> org-contribute section and see if I can come up with some verbiage.
Something like this? (I hope Iʼve got the syntax right, I seldom write
org for exporting purposes). The emacs CONTRIBUTE guidelines talk
about setting 'Author', but I guess not everyone reads those...
diff --git a/org-contribute.org b/org-contribute.org
index a3cb6f2b..c01bf417 100644
--- a/org-contribute.org
+++ b/org-contribute.org
@@ -270,6 +270,19 @@ * Your first commit as an Org maintainer
locally and make sure you have a clean commit history before merging
it into the =bugfix= or =main= branch.
+When applying patches written by other people, please ensure that the
+=Author= information of the resulting commit(s) is correct. When
+applying patches created with =git format-patch= this will happen
+automatically, but when applying simple diffs you will need to
+override the author. Here are three ways to do that, depending on
+which method you use to commit to git:
+
+1. Command line: src_sh{git commit --author='First Last <fl...@somewhere.com>'}
+2. =VC=: Set the 'Author:' field in log-edit mode (requires setting
+ `log-edit-setup-add-author').
+3. =Magit=: Override the author using the =-A= flag from magit's commit
+ transient.
+
To check our Git workflow in more details, please read
[[file:org-maintenance.org][Org maintenance]].
* Commit messages and ChangeLog entries
