Changes between Initial Version and Version 1 of GitSetup


Ignore:
Timestamp:
2011-09-18 12:16:22 (13 years ago)
Author:
edy
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • GitSetup

    v1 v1  
     1{{{ #!Markdown 
     2 
     3# Accessing the GIT repository 
     4 
     5## 1. Download and install GIT 
     6 
     7___[GIT for Windows][1]___ - Ensure to enable the Windows Explorer integration components when installing ("Git Bash here" / "Git GUI here"). 
     8 
     9___[GIT for Mac OSX][2]___ - GIT mostly works with Terminal commands. The graphical tools are invoked with commands _gitk_ and _git gui_. If _git gui_ doesn't run (_"image not found"_) you need to install the TCL/TK libraries __version 8.5__, [available here](http://www.activestate.com/activetcl/downloads). 
     10 
     11## 2. Clone the Vehicle Physics repository 
     12 
     13___Windows:___ Right-click the folder where you want to locate the Vehicle Physics project folder (don't create it) and select "Git Bash here" from the pop-up menu.   
     14___Mac OSX:___ Open a Terminal window, then type "cd Documents" so the project folder will be created inside your Documents folder. 
     15 
     16        $ git clone http://projects.edy.es/git/edy/vehicle-physics.git 
     17 
     18Enter your username and password when prompted. GIT will download and set up the repository. Once the command is completed you'll have the project ready for Unity at the folder _vehicle-physics_. Feel free to move or rename the folder if you want to. 
     19 
     20## 3. Working with GIT graphical tools 
     21 
     22___Windows:___ Right-click the vehicle-physics folder created above and select "Git GUI here" from the pop-up menu.   
     23___Mac OSX:___ Open a Terminal window, type "cd Documents/vehicle-physics", then "git gui". 
     24 
     25You can retrieve the latest updates anytime from GIT GUI at __Remote > Fetch from > origin__. The updates are downloaded to your local repository but don't worry, your files won't be overwritten. Go to the History window (__Repository > Visualize All Branch History__) to see what happened: the updates go to their own branch (_remotes/origin/master_), while your local changes remain in your local _master_ branch. You can merge them anytime (__Merge > Local merge__), or switch among them (__Branch > Checkout__, choose among local or tracking -remote-). 
     26 
     27Note that switching or merging branches requires your own changes to be __commited__ first to your local master branch. Select the changed files at the left-top box (_unstaged_), then __Commit > Stage to Commit__. Files are now at the left-bottom box (_staged_, which means they will be commited). Write a __Commit Message__ describing your changes, then click __Commit__. You can see the result at the History window (__Repository > Visualize All Branch History__). 
     28 
     29## Advanced: Accessing the repository via SSH 
     30 
     31The above setup requires to enter your username and password each time that the remote repository is accessed. Configuring SSH access allows you to work with the remote repository without having to enter your login data each time. 
     32 
     33___Windows:___ Right-click any folder and select "Git Bash here" from the pop-up menu.   
     34___Mac OSX:___ Open a Terminal window. 
     35 
     36        $ ssh-keygen -t rsa "your_email@youremail.com" 
     37 
     38Press enter on each prompt for leaving the default settings. Two files will be created at the subdirectory _.ssh_ inside your local user diretory: 
     39 
     40        id_rsa 
     41        id_rsa.pub 
     42 
     43Open the [Vehicle Physics project page](http://projects.edy.es/trac/edy_vehicle-physics/), then click _My Profile > Public Keys > New Key_. 
     44 
     45Open __id_rsa.pub__ using Notepad, select __all__ the text and copy it to the clip 
     46 
     47 
     48 
     49[1]: http://code.google.com/p/msysgit/downloads/list 
     50[2]: http://code.google.com/p/git-osx-installer/downloads/list 
     51 
     52 
     53 
     54}}}