[gst-devel] [gst-cvs] gst-plugins-good: Merge branch 'master' of ssh://thomasvs at git.freedesktop. org/git/gstreamer/gst-plugins-good

[Edward Hervey]

On Mon, 2009-03-02 at 00:43 -0800, Thomas Vander Stichele wrote:
> Module: gst-plugins-good
> Branch: master
> Commit: 9f25f96155b246663a1f900624ccda4b9eafcded
> URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-good/commit/?id=9f25f96155b246663a1f900624ccda4b9eafcded
> 
> Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
> Date:   Mon Mar  2 09:43:30 2009 +0100
> 
> Merge branch 'master' of ssh://thomasvs@git.freedesktop.org/git/gstreamer/gst-plugins-good

  Remember to all: Don't do non-fast-forward merges to the branch you
will be pushing. If you see a merge commit (like this one) before
pushing : DO NOT PUSH!

  Why ?
  * It pollutes the changelog
  * Rebase is cheap and easy.
  * It looks cleaner

  So, as a reminder, if you are working in branch <whatever>.
  * git rebase master
  * git checkout master
  * git merge whatever

  If you have already merged to master, you can still get rid of that
commit by rebasing against the origin:
  * git rebase origin/master

  Thanks,

     Edward

> 
> ---
> 
> 
> 
> 
> ------------------------------------------------------------------------------
> Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
> -OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
> -Strategies to boost innovation and cut costs with open source participation
> -Receive a $600 discount off the registration fee with the source code: SFAD
> http://p.sf.net/sfu/XcvMzF8H
> _______________________________________________
> gstreamer-cvs mailing list
> gstreamer-cvs at lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/gstreamer-cvs