Your SlideShare is downloading. ×
Mahara UK 2011 Technical Day - Git for Mahara
Upcoming SlideShare
Loading in...5
×

Thanks for flagging this SlideShare!

Oops! An error has occurred.

×
Saving this for later? Get the SlideShare app to save on your phone or tablet. Read anywhere, anytime – even offline.
Text the download link to your phone
Standard text messaging rates apply

Mahara UK 2011 Technical Day - Git for Mahara

1,495
views

Published on

My presentation/workshop from the Mahara UK 2011 technical day. …

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.

Published in: Technology

0 Comments
0 Likes
Statistics
Notes
  • Be the first to comment

  • Be the first to like this

No Downloads
Views
Total Views
1,495
On Slideshare
0
From Embeds
0
Number of Embeds
0
Actions
Shares
0
Downloads
15
Comments
0
Likes
0
Embeds 0
No embeds

Report content
Flagged as inappropriate Flag as inappropriate
Flag as inappropriate

Select your reason for flagging this presentation as inappropriate.

Cancel
No notes for slide

Transcript

  • 1. Mahara UK 2011 – Technical Conference21st June 2011
  • 2. Andrew Nicols
    Git in Mahara
  • 3. Git in Mahara
    • What is Git?
    • 4. Some of the Basics
    • 5. Remotes
    • 6. Branch, Branch, Branch!!!
    • 7. Rebases and Merges
    • 8. Splitting and Squashing
    • 9. Other Cool Stuff
    • 10. Q&A
  • What is Git?
    • Free
    • 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
    • 17. Very fast
  • Some Basics
  • Remotes
    Git is great for collaborative working
    It allows you to have multiple remotes
    git remote
    git remote show
    git remote add
    git fetch
    git push
  • 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