[FFmpeg-devel] Git short walkthrought Was: [GIT] ready by the weekend

Luca Barbato lu_zero
Wed Dec 15 13:29:17 CET 2010

On 12/14/2010 11:53 PM, Michael Niedermayer wrote:
> On Fri, Dec 10, 2010 at 01:33:08PM +0100, Luca Barbato wrote:
> [...]
>> 2. Updating the source tree to the latest revision:
>>     git pull
>>   pulls in the latest changes from the repository to your local master branch.
>> 2.a Rebasing your local branches:
>>     git pull --rebase
>>   fetches the changes from the main repository and replays your local commits
>>   over it. This is useful to keep all your local changes at the top of your
>>   tree.
> a few words of the relation of these to "svn up" should be added

Not sure exactly what to write in this regard.

> Please mention that git is better at that when removial and addition are in the
> same commit (that is IIRC)

Ok, usually it helps us understand what's going on anyway.

>>   The main repository will reject those changes.
> has this been verified?

Till we don't have it we cannot check ^^;



Luca Barbato

More information about the ffmpeg-devel mailing list