Quick presentation given a bunch of weeks ago fro our predocs primer. It's very basic overview of git, with some nice links at the end.

1. Git It!
Michele Mattioni
mattioni@ebi.ac.uk
@mattions

2. <1>

3. My ideal version control system
● Fast
● Flexible
● Offline
● Smart

4. CVS/SVN
● CVS:
– I never used CVS. I'm too young.
● SVN:
– I can't commit locally
– I can't branch as I wish
– The Merging just doesn't work.
– All the operation are on-line. (No connection no
cookies)

5. Bazaar
● Good things:
– No network needed
– Really cool way to export your code in a tarball
● Problems:
– SVN interface didn't work properly
– Branching and merging is ok but not as fast as git.

6. What is Git?
Git is an opensource distributed verson control
system which makes you happy.

7. Hey, but I work alone!
● Do you develop in linear fashon?
● Do you usually make a massive commit and
then you can't track what you had really
changed?

8. Or... I have just a bunch of files
● Don't you change them quite often?
● Don't you need to keep track of what is going
on?
● ...

9. </1>

10. <2>

11. Different Way of thinking:
Delta Storage

25. Local Rules:
With No Network you can:
● Performing a diff
● Viewing file history
● Committing changes
● Merging branches
● Obtaining any other revision of a file
● Switching branches

30. Non Linear Development:
Try your ideas

31. Freedom!!!!

39. You can move around a lot of
branches and try different things
$ git checkout -b feature_x
#hack #hack
$ git commit -am ”Adding new feature_x”
$ git checkout master
$ git merge feature_x
It's fast
You retain control

40. </2>

41. <3>

42. Basic use:
git init – Init a new repository
git add file1-- Add file1 to the repo
git commit -m ”My first initial
commit” -- Commit

43. Stage Idea

44. add a file you don't commit it but you
put it in the index

45. If you just add a file this is staged but
not committed

46. Commit: You commit everything that
you have added

47. When you commit the file is
recorded in the repo.

48. Scenario
File1 -- Correct a typo
File2 -- introduced a new method
File3 -- Introduced new method

49. Control gives you flexibility
$ git add file1
$ git commit -m ”corrected a typo.”
$ git add file2 file3
$ git commit -m ”Introduced the
newfeature to land on the moon.”

50. Mantra: Small commit are good
Do a lot of commit and divide your change
logically in small part.
It will help you a lot when you will break
everything (and you will...)

53. -a switch
git commit -am ”I commit all 3 files
in one go.”

54. </3>

55. <4>

56. Working online
$ git push origin master
$ git pull origin master
Can be any branch
$ git push origin feature_x

57. github.com/edu

58. Github is just good

59. Easy docs for your project hosted
automatically

60. Nice way to collaborate

61. </4>

62. Bonus info
#git branch
parse_git_branch() {
git branch 2> /dev/null | sed -e
'/^[^*]/d' -e 's/* (.*)/(1)/'
}
#grey
PS1='[33[0;32m]u[33[1;32m]@
[33[0;32m]h[33[00m]:
[33[01;34m]W[33[1;30m]$
(parse_git_branch)[33[00m]$ '

63. Results

64. Useful resources:
Git http://git-scm.com/
Github http://github.com
Nice guide http://rogerdudler.github.com/git-guide/
my profile https://github.com/mattions
Credits: Some of the slides were taken from Scott Chacon
https://github.com/schacon