Index

1. Introduction to git

• git is a is a distributed revision control system
• useful for managing text based changes across multiple files and directories
  • distributed
  • allows files to be removed, moved
  • user can commit changes and retrieve previous changes
• very useful for programming or managing documents in groff or latex format
• not so useful for openoffice documents
• but it could still be used
  • just not as efficient as using text

2. Server side: setting up your own git server

• use mcgreg.comp.glam.ac.uk

• $ cd
  $ mkdir myrepo.git
  $ cd myrepo.git
  $ git --bare init

• the above only needs to be done once
  

3. Client side

• firstly we need to define where the git repro lives

• $ git remote add origin username@mcgreg.comp.glam.ac.uk:/home/username/myrepo.git
  $ git push origin master

• defines origin to the mcgreg url
• sets the master branch (like cvs head) to the origin
  • for personal git repros you will rarely need to bother with branches
  • thus the master branch can be ignored here

• $ mkdir -p Sandpit/firstcopy
  $ cd Sandpit/firstcopy
  $ git init
  $ git add
  $ touch README
  $ git commit -m "My first file committed"
  $ git push

4. Client side copy

• to take another copy of the files from the repository you can

• $ mkdir -p Sandpit/secondcopy
  $ cd Sandpit/secondcopy
  $ git clone username@mcgreg.comp.glam.ac.uk:/home/username/myrepo.git

• now you could make some modifications and then

• $ cd Sandpit/secondcopy
  $ emacs README
  $ git commit -m "My second commit"
  $ git push

• which uploads changes back to the master on mcgreg
  

5. What changes have I made?

• can use

• $ git diff

• to see the differences between your local copy and the repository
• can use:

• $ git log

• to see the entire history of all changes, or:

• $ git log version.c

• to see the history of all changes to the file version.c
  

6. Tagging in git

• you can tag a release or stage of development by:

• $ git tag version1.0 -m "version 1.0"

• to see all available tags type:

• $ git tag

7. To go back in time to a previous version

• $ mkdir thirdcopy
  $ cd thirdcopy
  $ git clone username@mcgreg.comp.glam.ac.uk:/home/username/myrepo.git
  $ git checkout version1.0

• or you could go back to another commit time (as seen by the git log )

• $ mkdir fourthcopy
  $ cd fourthcopy
  $ git clone username@mcgreg.comp.glam.ac.uk:/home/username/myrepo.git
  $ cd myrepo.git
  $ git log
  etc etc
  ec1c3b3fa9844e3304fe24eb54e0529e356883f7
  etc etc
  $ git checkout ec1c3b3fa9844e3304fe24eb54e0529e356883f7
  Note: checking out ’ec1c3b3fa9844e3304fe24eb54e0529e356883f7’.
  
  
  You are in ’detached HEAD’ state. You can look around, make experimental
  changes and commit them, and you can discard any commits you make in this
  state without impacting any branches by performing another checkout.

Index

This document was produced using groff-1.22.