Revision as of 07:51, 29 March 2011

Brief Git Guide

Git is handy version control for collaborative development and testing. This guides you briefly through basics to get started. Only terminal usage under Linux is covered, for graphical user interfaces please refer guides available at web.

Note - this was not placed under developer nor testing because it's common for all MeeGo contributors.

Concepts

Please open excellent git cheat sheet Workflow with is illustrated in the upper-right corner of cheat sheet. The most basic flow with existing repository goes like:

1. Create

 git clone <repository>

Example:

 git clone git://gitorious.org/meego-quality-assurance/handset-ux-tests.git

2. Change

<edit or create files with your favorite tools / editors>

3. Commit changes

 git add <newfile> (if you created new file)
 git commit -a 

Your default editor is opened and you need to write description of changes.

4. Push changes to share

 git push (this assumes you have commit rights to repository, please check with repository admin)

That's it! Congratulations!

Pre-steps

Mandatory - Make sure you have git installed

Ubuntu:

 sudo apt-get install git

Optional - If working behind ssh-proxy

If you are working with corporation you might need to resolve ssh-proxy challenge.

Make sure you have following $USER/.ssh/config for your user account

 host proxy 
   HostName <yoursshproxyhere>
   user <youruseraccounthere>
   Compression no
   LocalForward 2227 gitorious.org:22
 host gitorious.org
   User git
   HostName 127.0.0.1
   Port 2227
 

Run the following command:

 ssh -f -N proxy
 <type password for your account, if required>

Please note that you need to open proxy connection every time you change network or disconnect/connect from network

Now you can clone and push over ssh proxy to gitorious.org, test as follows:

 git clone git://gitorious.org/meego-quality-assurance/handset-ux-tests.git