[x264-devel] commit: Merge branch 'master' of git at git.videolan.org:x264 ( Guillaume Poirier )

[Guillaume POIRIER]

Hello,

On 3/31/08, Zuxy Meng <zuxy.meng at gmail.com> wrote:
> Hi,
>
>  2008/3/31, Guillaume POIRIER <poirierg at gmail.com>:
>
> > Hello,
>  >
>  > On 3/31/08, git version control <git at videolan.org> wrote:
>  > > x264 | branch: master | Guillaume Poirier <gpoirier at mplayerhq.hu> | Mon Mar 31 11:36:36 2008 +0200| [ff5059a77fe4a85ed62b8e77b8cda0fb56d8350e]
>  > >
>  > >  Merge branch 'master' of git at git.videolan.org:x264
>  > >
>  > >  > http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=ff5059a77fe4a85ed62b8e77b8cda0fb56d8350e
>  >
>  > I hope this is the intended behaviour of GIT: I got this extra commit
>  > because I had some locally-committed changes when I pulled x264's
>  > changes, which fixed the -soname typo...
>  >
>  > I'm a noob regarding GIT, so please enlighten me so that, if I made a
>  > mistake, I don't do it again.
>
>
> You didn't rebase before you pushed?

That's quite possible indeed. The version of GIT that I use may be
"outdated" (1.5.3.7, released on 01-Dec-2007 21:21) as it doesn't
support the command "git up --rebase", so I left it out when I update.

I wonder if there's a way to do an a-posteriori rebase of the my source tree....
Any expert here?


>  Anyway I'm newbie for Git too so hopefully somebody can write a "best
>  practices using Git for x264" or something like that :-)

I'm mostly using VLC's: http://wiki.videolan.org/Git

Guillaume
-- 
A soldier will fight long and hard for a bit of colored ribbon.
 -- Napoleon Bonaparte