[FFmpeg-devel] h264 - Correct implicit weight table computation for long ref pics

[Clément Bœsch]

On Fri, Jul 29, 2011 at 12:20:22AM +0200, Stefano Sabatini wrote:
[...]
> then I git commit/amend or git rebase -i on it.
> 
> When I want to push some specific commits from the topic branch, I
> cherry-pick the selected committs:
> 
> git co master
> git log origin.. --pretty=oneline --reverse BRANCH
> git cherry-pick HASH1
> git cherry-pick HASH2
> ...
> 

If your branch is rebased on the master:

  git co master
  git merge BRANCH

will be enough (there won't be any merge any commit).

-- 
Clément B.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 490 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20110729/8fe407c4/attachment.asc>