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

[Pierre d'Herbemont]

On Jul 21, 2008, at 8:21 AM, Pavlov Konstantin wrote:

> 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?

I suggest you to have a look at git up and git wu:

http://wiki.videolan.org/Git#Configure_your_global_git_config

Pierre.