Re: How do I set the committer with cherry-pick? (or is there a better way to get changes from someone?)
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Apr 6, 2008, 00:05 UTC
- Message-ID
- <7vhcefvoeg.fsf@gitster.siamese.dyndns.org>
- In-Reply-To
- <810a540e0804051642r79dc10a7h2a231561062b13ea@mail.gmail.com>
"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".
> 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.