Introduzione a git - talk tenuto al meeting del JUG Padova 18 ottobre 2008

1. Magie di „ … any sufficiently advanced technology is indistinguishable from magic. “ Arthur C. Clarke

2. termine gergale britannico per indicare una persona stupida o sgradevole.

3. „ Sono un egoista bastardo, e do a tutti i miei progetti un nome che mi riguardi. Prima Linux, adesso Git “ Linus Torvard

5. distributed development

6. HTTP, FTP, ssh, rsync, or a Git protocol

7. cryptographic authentication

8. toolkit design

9. pluggable merge strategies

10. http://www.flickr.com/photos/mewerts/

12. http://www.flickr.com/photos/velkr0/

13. Setup & Initialization setting a few global variables: git config --global user.name “michele franzin“ git config --global user.email michele@franzin.net git config --global color.status auto git config --global color.branch auto create a git repository in the current project directory: git init git add . git commit -m "initial commit of project"

14. Basic Workflow make some changes, review what you have done, stage (add) those changes, commit # make some changes to README.txt git status git diff git add README.txt git commit -m "updated the description" make some BAD changes, revert to the last state # make some bad changes to config/hoe.rb git status git reset --hard HEAD #NOT -> git revert HEAD

16. Per Directory - put it in a .gitignore file

17. Exploring history exploring commit messages git log git log --since="2008-05-20" git log --since="1 week ago" --until="2 days ago" git log path/to/file git log -p show commit details git show c82a22c39cbc32576f64f5c6b3f24b99ea8149c7

18. Simple Branching and Merging # write a Hello World program tmp/hw.rb git add tmp/hw.rb git commit -m "hello commit" git checkout -b refactor # refactor out our puts git commit -a -m "refactored puts" git branch # lists banrches git checkout master git pull . refactor # fast forward merge

19. http://www.flickr.com/photos/26810211@N06

20. http://www.flickr.com/photos/22355750@N07/

22. conflicts are marked with “<“

23. resolve them using git mergetool

24. git add the files

25. Collaborating & Contributions git clone /home/alice/project myrepo (edit files) bob$ git commit -a alice$ cd /home/alice/project alice$ git pull /home/bob/myrepo master # inspect without merging alice$ git fetch /home/bob/myrepo master alice$ git log -p HEAD..FETCH_HEAD

26. GITK gitk

28. http://www.jgit.org/

31. http://www.flickr.com/photos/studiomuntz/

32. [email_address] ...thank you