• Like
  • Save
Mahara UK 2011 Technical Day - Git for Mahara
Upcoming SlideShare
Loading in...5
×
 

Mahara UK 2011 Technical Day - Git for Mahara

on

  • 1,622 views

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.

Statistics

Views

Total Views
1,622
Views on SlideShare
1,621
Embed Views
1

Actions

Likes
0
Downloads
15
Comments
0

1 Embed 1

http://www.slideshare.net 1

Accessibility

Categories

Upload Details

Uploaded via as Microsoft PowerPoint

Usage Rights

© All Rights Reserved

Report content

Flagged as inappropriate Flag as inappropriate
Flag as inappropriate

Select your reason for flagging this presentation as inappropriate.

Cancel
  • Full Name Full Name Comment goes here.
    Are you sure you want to
    Your message goes here
    Processing…
Post Comment
Edit your comment

    Mahara UK 2011 Technical Day - Git for Mahara Mahara UK 2011 Technical Day - Git for Mahara Presentation Transcript

    • Mahara UK 2011 – Technical Conference21st June 2011
    • Andrew Nicols
      Git in Mahara
    • Git in Mahara
      • What is Git?
      • Some of the Basics
      • Remotes
      • Branch, Branch, Branch!!!
      • Rebases and Merges
      • Splitting and Squashing
      • Other Cool Stuff
      • Q&A
    • What is Git?
      • Free
      • Open Source
      • Distributed Version Control System
      • Every Git Clone is a full-fledged repository
      • Complete History
      • Not network dependent
      • No requirement for central server
      • Very fast
    • Some Basics
      • git clone
      • git init
      • git add
      • git add –p
      • git commit
      • git commit --amend
      • git log
      • git log –stat=500
      • git log -p
      • git status
      • git diff
      • git diff --cached
    • 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
    • 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
    • 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
    • Rebases and Merges
    • Rebases and Merges
    • Rebases and Merges
    • Rebases and Merges
    • Splitting and Squashing
      Re-write your commits before you make them public
      Keep things tidy
      git edit –i HEAD~3
    • Other Cool Stuff
      git grep
      git cherry-pick
      git format-patch
      git bisect
      git reflog
      gitk
      git shortlog
      git archive
    • Q&A