On May 22, 11:54 pm, Alex Ogier <alex.og...@gmail.com> wrote: > On Tue, May 22, 2012 at 4:34 PM, Richard Laager <rlaa...@wiktel.com> wrote: > > On Tue, 2012-05-22 at 04:18 -0700, Anssi Kääriäinen wrote: > >> if the patch author doesn't do the final squashing, then > >> she/he will not end up as the "Author" in the commit logs. > > > This isn't an issue. Just do: > > git commit --author "John Doe <j...@example.com>" > > > And if the "squash merge" workflow (which isn't something I've used) > > doesn't allow you to set the author, then just follow it by: > > git commit --amend --author "John Doe <j...@example.com>" > > Git actually has native support for this workflow. Each commit has an > "author" and a "committer" which are typically the same, but in the > case of a squash merge or patch are different.
The catch was meant to be that you won't get to be official author if you don't do the final polish yourself. Maybe that isn't the brightest of idea, we would probably still want that author information in this case, too. The more I work with the pull requests, the clearer it is that we need not be overly pedantic with requiring the author to do all the polishing. Requiring the author to remove one space, then waiting for that space to be removed and finally merging the work is a lot more laborious than just doing this simple change on commit. So, I will try to reword the doc changes to suggest a lightweight path for those who just want their change into Django (patch in Trac ticket or a pull request, no need for good commit messages or rebasing), and then have documentation for how to create perfect commit ready pull requests, and suggest trying to use that path if the contributor wants to contribute to Django more than just a single patch. This is very much work in progress and I expect more changes to the workflow still. Thank you all very much for the feedback so far, - Anssi -- You received this message because you are subscribed to the Google Groups "Django developers" group. To post to this group, send email to django-developers@googlegroups.com. To unsubscribe from this group, send email to django-developers+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/django-developers?hl=en.
