[vlc-devel] Switching to git (2)

Pierre d'Herbemont pdherbemont at free.fr
Tue Feb 19 02:26:51 CET 2008


I have re-imported the current trunk with the correct (hopefully)  
author name, it is available here:
(Note that it is not resync-ed automatically with svn, we can do that  
by hand when needed)

We are more or less ready to perform the switch, and we just need to  
agree on a date to perform it (that mean freezing SVN, and making the  
vlc.git writable).

A small summary:
* We are using gitosis for the administration of the repos. It is very  
* We do need a public key for each committer. Please send me yours.
* You are strongly encouraged to play a bit with vlc-sandrox to  
familiarize with git
* You need to fix up your email address prior committing
* There are several way to work with git, for now I guess that the  
typical commands that match our current svn usage are:
$ git clone git at git2.videolan.org:vlc-sandrox.git
$ git commit -a (no equivalent)
$ git commit myfile (no equivalent)
$ git pull --rebase # svn up
$ git push (svn commit)

A small note on git pull:
Basically when using git and committing locally you are indeed working  
on your own branch, so a simple git pull will create a merge object  
and merge your local branch to the upstream. That's not how svn works.
git pull --rebase will put your work on top of the latest commit in  
upstream and will act as svn does.

Have fun,


More information about the vlc-devel mailing list