Difference between revisions of "Git"

From VideoLAN Wiki
Jump to navigation Jump to search
(Git web)
(More info)
Line 6: Line 6:
 
  git branch master
 
  git branch master
  
== Local commit ==
+
== List the local branch ==
Now that you have downloaded the sources you need to create a branch for your own work
+
You can now list your local branch by doing
  git branch master
+
git branch
 +
which should ouput
 +
* 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 '''localy''' 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
 +
 
  
 
== 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:37, 12 April 2007

Getting VLC source code via Git

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

You can also browse the source via gitweb.

Prepare a local branch to work on

git branch master

List the local branch

You can now list your local branch by doing

git branch

which should ouput

* 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 localy 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


Documentation about git