Merge or Cherry-Pick?

[Johannes Sixt]

Am 2/10/2011 10:40, schrieb Ben Cooksley:
> On Thu, Feb 10, 2011 at 9:35 PM, Johannes Sixt <j.sixt at viscovery.net> wrote:
>>  git push origin KDE/4.6
> 
> This is wrong, as it would try to push the content of HEAD (the merge
> of origin/KDE/4.6 into a checkout of origin/master) into KDE/4.6.

Now you made me think about it. But, no, it is correct:

  git push remote branch

is always a shorthand for

  git push remote branch:branch

regardless of the push.default configuration setting. Therefore, the
command I gave pushes the local KDE/4.6 branch to the remote KDE/4.6
branch, regardless what you have checked out.

> 
>>  git push origin HEAD:master

-- Hannes