Gerald (Jerry) Carter
jerry at samba.org
Fri Oct 12 12:30:13 GMT 2007
-----BEGIN PGP SIGNED MESSAGE-----
Stefan (metze) Metzmacher wrote:
> Hi Jerry,
> you're the author of this commit because your
> resolved conflicts?
I cherry-picked three different changes using --no-commit.
So yes. I'm the author. If I had not used --no-commit
or had commited with "git-comcmit -c <orginal hash>", it would
have used the original commit msg.
What I was trying to do was to chunk related commits together.
And, like you, I'm not sure I like that behavior.
This is one the reasons why I prefer git-merge over git-cherry-pick
but given how development is going in v3-2-test, I cannot merge to
v3-2-stable since all the changes should not apply right now.
For example the IPv6 work is too early for 3.2.0.
But since I'm just experimenting anyways, that's a test branch and
was why I never pushed to -stable.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
-----END PGP SIGNATURE-----
More information about the samba-technical