[vlc-devel] commit: Merge branch 'master' of git at git.videolan.org:vlc ( Derk-Jan Hartman )

[Pavlov Konstantin]

On Mon, Jul 21, 2008 at 02:41:05AM +0200, Derk-Jan Hartman wrote:
> On 21 jul 2008, at 02:33, git version control wrote:
> > vlc | branch: master | Derk-Jan Hartman <hartman at videolan.org> | Mon  
> > Jul 21 02:35:21 2008 +0200| [cd4c4f1dadf2a9b595948da6d70ac2eaad93c990]
> >
> > Merge branch 'master' of git at git.videolan.org:vlc
> >
> >> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=cd4c4f1dadf2a9b595948da6d70ac2eaad93c990
> > ---
> 
> Can somone explain to me what I just did there ?

Forgot to use git pull --rebase, and did git pull instead?

-- 
Police up your spare rounds and frags.  Don't leave nothin' for the dinks.
- Willem Dafoe in "Platoon"
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://mailman.videolan.org/pipermail/vlc-devel/attachments/20080721/920c3754/attachment.sig>