Git: Difference between revisions

From OLPC
Jump to navigation Jump to search
(→‎Description: wordsmithing)
(→‎Git Commands: word smithing)
Line 36: Line 36:
OR
OR
git clone git://dev.laptop.org/activities/epals
git clone git://dev.laptop.org/activities/epals

Note that projects are in random directories of the Git repository, such as 'activities',
'projects', the root directory, and individual user accounts. Check the repository at
http://dev.laptop.org/git for the correct spelling and capitalization of each project.

For example, the PlayGo activity is listed as "projects/PlayGo". To clone (or download
a copy of the source code) for the PlayGo activity, use:
git-clone git://dev.laptop.org/projects/PlayGo

While the 'sugar' project is in the root directory:
git-clone git://dev.laptop.org/sugar
You can update the code as follows:
You can update the code as follows:
Line 42: Line 53:
git-checkout -- (To undo your commits)
git-checkout -- (To undo your commits)
git checkout HEAD -- filename (To replace filename with the one at HEAD)
git checkout HEAD -- filename (To replace filename with the one at HEAD)

For example, to clone the Sugar repository:
git-clone git://dev.laptop.org/sugar

To clone the PlayGo repository in the projects directory:

git-clone git://dev.laptop.org/projects/PlayGo


== Git for OLPC ==
== Git for OLPC ==

Revision as of 07:00, 20 March 2008


Pencil.png NOTE: The contents of this page are not set in stone, and are subject to change!

This page is a draft in active flux ...
Please leave suggestions on the talk page.

Pencil.png
This command is run in the standard Linux environment via the Terminal Activity. The GUI will probably not integrate comfortably with the XO Laptop's Sugar environment. Your user experience may vary considerably depending on the established environment and the other programs running on the laptop, may need re-installation after an OS Update. See the Linux software category for other commands.


Description

Git is a version control system (sometimes called a "revision control system") for programmers used to track and manage changes to code. It is a decentralized system, with no "master" tree, and was originally written by Linus Torvalds to manage the Linux kernel sources. Git is used by many open source projects to manage development among programmers, and is used by the OLPC as its preferred version control system.

Installation

First, you'll need to fetch and install Git on your machine. The tarball with the latest version is always available at the git site, and you might find your distribution provides packages. You can expect that the OLPC servers will always be running close to the latest version of the git tools.

In OpenSuSE
yast --install git
In RedHat & XO Laptop
sudo yum install git
In Ubuntu 7/Feisty and Debian Etch (and presumably earlier) "git" still refers to gitfm, an unrelated tool. To fix in feisty:
sudo apt-get install git-core cogito 
sudo update-alternatives --config git

Running

Git Commands

To get a project's code for the first time, use "git clone" :

git-clone git://dev.laptop.org/<project-directory> (To get the code)

For instance:

git-clone git://dev.laptop.org/activities/epals 
    OR 
git clone git://dev.laptop.org/activities/epals 

Note that projects are in random directories of the Git repository, such as 'activities', 'projects', the root directory, and individual user accounts. Check the repository at http://dev.laptop.org/git for the correct spelling and capitalization of each project.

For example, the PlayGo activity is listed as "projects/PlayGo". To clone (or download a copy of the source code) for the PlayGo activity, use:

git-clone git://dev.laptop.org/projects/PlayGo

While the 'sugar' project is in the root directory:

git-clone git://dev.laptop.org/sugar

You can update the code as follows:

git-pull (To update the code)
git-status -a  (To see the status of your commits)
git-checkout -- (To undo your commits)
git checkout HEAD -- filename (To replace filename with the one at HEAD)

Git for OLPC

To get a project of yours hosted in our Git instance, see Project hosting.

OLPC GIT: http://dev.laptop.org/  (for tracking and submitting bugs and tasks)

    Wiki: http://dev.laptop.org/wiki
 Roadmap: http://dev.laptop.org/roadmap
 Sources: http://dev.laptop.org/browser
 Tickets: http://dev.laptop.org/query

Further Resources