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.

For example, 
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=commit;h=72c04af9a2d57b7945cf3de8e71461bd80695d50

Best,
Alex Ogier

-- 
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.

Reply via email to