My presentation/workshop from the Mahara UK 2011 technical day. This gives a quick insight into Git, what git is, some of the useful features of git are, and how it can be used in Mahara.

1. Mahara UK 2011 – Technical Conference21st June 2011

2. Andrew Nicols Git in Mahara

4. Some of the Basics

5. Remotes

6. Branch, Branch, Branch!!!

7. Rebases and Merges

8. Splitting and Squashing

9. Other Cool Stuff

11. Open Source

12. Distributed Version Control System

13. Every Git Clone is a full-fledged repository

14. Complete History

15. Not network dependent

16. No requirement for central server

18. git init

19. git add

20. git add –p

21. git commit

22. git commit --amend

23. git log

24. git log –stat=500

25. git log -p

26. git status

27. git diff

29. Branch, Branch, Branch!!! Branches are cool Branches don’t suck in Git (yes I know they do in subversion) git checkout –b <branchname> git branch git branch --all

30. Rebases and Merges Rebase rewrites history Merge combines histories Rebasing changes the parent of a commit Don’t use rebase if you’re going to step on someone elses toes git rebase origin/master git rebase gerrit/master git merge my_local_branch

31. Rebases and Merges

32. Rebases and Merges

33. Rebases and Merges

34. Rebases and Merges

35. Splitting and Squashing Re-write your commits before you make them public Keep things tidy git edit –i HEAD~3

36. Other Cool Stuff git grep git cherry-pick git format-patch git bisect git reflog gitk git shortlog git archive

37. Q&A