git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 18:18:45 -0700	[thread overview]
Message-ID: <7vwsnbu6fe.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <810a540e0804051758j5daea9a8vfe36396ecbb36a08@mail.gmail.com> (Pat Maddox's message of "Sat, 5 Apr 2008 17:58:33 -0700")

"Pat Maddox" <pergesu@gmail.com> writes:

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

Well, at that point, you are not the committer for their changes on their
clean history, and you shouldn't expect to be recorded as such.  Your
contribution to the project might still be recorded as the committer of
the merge commit that pulled their contributions in, though.

Any history is just as valid as your integration branch's history.  There
may be hundreds of potential histories in the universe --- each and every
contributor, anybody who clones and plays with the project may create his
own history.  Each contributor in their repository will be commiting their
changes and building their histories.  If one of these alternative
histories is so agreeable for you that makes you happy to pull from it,
that means the creator of that history did extra work to keep it clean (or
rebuilt it to look like clean).  Give the contributor the credit for his
own segment of the history when you merge from him.

Among these many alternate histories, yours may happen to be the one many
people consider more authoritative than others', but other than that, you
are not any more special than them.

That's what distributed means.

      reply	other threads:[~2008-04-06  1:20 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
2008-04-06  0:58   ` Pat Maddox
2008-04-06  1:18     ` Junio C Hamano [this message]

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=7vwsnbu6fe.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).