Merge or Cherry-Pick?

[Thiago Macieira]

On Wednesday, 2 de February de 2011 05:58:35 John Tapsell wrote:
> git rebase -i origin   #Bring up a list of your changes.
> 
> <Reorder them in the editor so that the commit you want to push is at
> the top of the list, save>
> 
> <Fix any conflicts that might have arisen because you reordered the commits>
> 
> git pull --rebase   #make sure we are up to date
> 
> git log      #copy the SHA of the commit you want to push up to

Hint:
	git log @{upstream}..
(the two dots included)

> 
> git push origin SHA:head   #paste the SHA that you just copied where I
> wrote "SHA"

I think "head" here is supposed to be the branch you want to push to. Please 
avoid using "head", as it easily is confused with HEAD.

-- 
Thiago Macieira - thiago (AT) macieira.info - thiago (AT) kde.org
  Senior Product Manager - Nokia, Qt Development Frameworks
      PGP/GPG: 0x6EF45358; fingerprint:
      E067 918B B660 DBD1 105C  966C 33F5 F005 6EF4 5358
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 190 bytes
Desc: This is a digitally signed message part.
URL: <http://mail.kde.org/pipermail/kde-core-devel/attachments/20110202/96acf288/attachment.sig>