[gst-devel] [gst-cvs] gst-plugins-good: Merge branch 'master' of ssh://thomasvs at git.freedesktop. org/git/gstreamer/gst-plugins-good
felipe.contreras at gmail.com
Mon Mar 2 13:34:03 CET 2009
On Mon, Mar 2, 2009 at 12:05 PM, Edward Hervey <bilboed at gmail.com> wrote:
> 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://email@example.com/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
Huh? Most git newbies don't do branches. For them perhaps 'git pull
--rebase' would be more natural, since they can keep working on one
branch as with CVS/SVN.
More information about the gstreamer-devel