Difference between revisions of "Git"

From VideoLAN Wiki
Jump to navigation Jump to search
m (Spelling fixes, and printing shell command fix.)
(Configure your local git repo)
Line 1: Line 1:
 
== Getting VLC source code via Git ==
 
== Getting VLC source code via Git ==
 
  git clone git://git.videolan.org/vlc.git
 
  git clone git://git.videolan.org/vlc.git
You can also browse the source via [http://git.videolan.org/cgi-bin/gitweb.cgi gitweb].
+
You can also browse the sources via [http://git.videolan.org/cgi-bin/gitweb.cgi gitweb].
  
== Prepare a local branch to work on ==
+
== Configure your local git repository ==
  $ git branch master
+
Tell git your name. (used by mostly by git-commit)
 +
$ git repo-config user.name "Your Name"
 +
  $ git repo-config user.email "me@example.com"
  
 
== List the local branch ==
 
== List the local branch ==
Line 33: Line 35:
 
to go back to your normal branch
 
to go back to your normal branch
  
 +
== Submitting ==
  
 
== Documentation about git ==
 
== Documentation about git ==
 
* [http://git.or.cz/ Official Git Website]
 
* [http://git.or.cz/ Official Git Website]
 
* [http://www.kernel.org/pub/software/scm/git/docs/tutorial.html Git Tutorial]
 
* [http://www.kernel.org/pub/software/scm/git/docs/tutorial.html Git Tutorial]

Revision as of 20:40, 12 April 2007

Getting VLC source code via Git

git clone git://git.videolan.org/vlc.git

You can also browse the sources via gitweb.

Configure your local git repository

Tell git your name. (used by mostly by git-commit)

$ git repo-config user.name "Your Name"
$ git repo-config user.email "me@example.com"

List the local branch

You can now list your local branch by doing

$ git branch

which should ouput

$ git branch
* master

Commit

Now you can start to work on your tree. As soon as you feel you've reached a step in developement you can commit locally your work by

$ git commit -a

or

$ git commit <specific files>

Keeping your local working branch in sync

$ git fetch origin
$ git rebase origin

voilà! Your commit will be re-applied on top of the origin (the svn trunk).

Creating a secondary local branch

If you want to work on a specific project that could require a branch of the trunk

$ git branch mywork

to actually use it

$ git checkout mywork

Then do some commit on it

$ git checkout master

to go back to your normal branch

Submitting

Documentation about git