From: Junio C Hamano <gitster@pobox.com>
To: "Pat Maddox" <pergesu@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: How do I set the committer with cherry-pick? (or is there a better way to get changes from someone?)
Date: Sat, 05 Apr 2008 17:05:11 -0700 [thread overview]
Message-ID: <7vhcefvoeg.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <810a540e0804051642r79dc10a7h2a231561062b13ea@mail.gmail.com> (Pat Maddox's message of "Sat, 5 Apr 2008 16:42:55 -0700")
"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.
next prev parent reply other threads:[~2008-04-06 0:06 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-05 23:42 How do I set the committer with cherry-pick? (or is there a better way to get changes from someone?) Pat Maddox
2008-04-06 0:05 ` Junio C Hamano [this message]
2008-04-06 0:58 ` Pat Maddox
2008-04-06 1:18 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vhcefvoeg.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=pergesu@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).