Re: How do I set the committer with cherry-pick? (or is there a better way to get changes from someone?)

From: Pat Maddox <pergesu@gmail.com>
Date: Apr 6, 2008, 00:58 UTC
Message-ID: <810a540e0804051758j5daea9a8vfe36396ecbb36a08@mail.gmail.com>
In-Reply-To: <7vhcefvoeg.fsf@gitster.siamese.dyndns.org>

On Sat, Apr 5, 2008 at 5:05 PM, Junio C Hamano <gitster@pobox.com> wrote:

Show 11 quoted lines

> "Pat Maddox" <pergesu@gmail.com> writes:
>
>  > At this point the commits are in the repo, but they only have author
>  > information.  I'd like to specify that I'm the one who committed this
>  > change now.  How can I do that?
>
>  You've already done that.  They are not what you _wrote_ so your name
>  won't be on "Author:" lines, but you made into commits in the final
>  history, and your name would appear on "Committer:" lines.
>
>  Try "log --pretty=fuller".

Ah, okay.  I see.  Thanks.

Show 14 quoted lines

>  > And finally, is this a good way to incorporate changes from other
>  > devs?  Is there a better way?
>
>  A _better way_, especially because you are already pulling from them,
>  would be just "pull", without having to cherry-pick to clean-up the
>  history.
>
>  The reason you are being forced to cherry-pick is probably _their_
>  histories you pulled are suboptimal and full of garbage commit, containing
>  irrelevant changes you do not want to include in the mainline you
>  maintain.  Have _THEM_ clean their act and prepare clean history that
>  consists only of relevant commits.  Shift as much burden as possible to
>  the contributors; otherwise the central integrator will become the
>  bottleneck in the process.

That makes sense. So let's say somebody made some changes of their own that I don't want in the repository. Would the best thing for them to do be to create a new branch off of my main line, and then cherry-pick their commits in themself. Then they send me the url along with the branch, so that when I pull from them it's only the new commits applied to the main line.

And finally, when I experimented with doing a pull instead of cherry-pick, it listed the original author as the committer instead of myself. I think you're absolutely right that the burden should be on them, so I can tell them to create a clean commit branch and just pull from it, but I still need to be listed as the committer.

Pat