Successfully reported this slideshow.
We use your LinkedIn profile and activity data to personalize ads and to show you more relevant ads. You can change your ad preferences anytime.

Git How Does That Work Then

3,156 views

Published on

Explain a little about git and how we use it in Mer and Maemo.

Please note that there are notes for these slides (click the 'Notes' link/tab by the 'Comments' tab below)

Published in: Technology
  • Login to see the comments

Git How Does That Work Then

  1. 1. VCS “Initial commit” David Greaves / lbt
  2. 2. DVCS git
  3. 3. complex apply archive bisect blame branch bundle checkout cherry-pick commit config dch describe diff difftool fetch filter-branch format-patch fsck gui help imap-send init log merge pull push rebase relink remote repack request-pull reset revert rm show-branch stage stash status svn submodule tag whatchanged add add am annotate apply archive bisect blame branch buildpackage bundle checkout cherry cherry-pick citool clean clone commit config dch describe diff difftool fetch filter-branch format-patch fsck gc get-tar-commit-id grep gui help imap-send import-dsc import-dscs import-orig init instaweb log merge mergetool mv name-rev pull push rebase relink remote repack request-pull reset revert rm send-email shortlog show show-branch stage stash status submodule svn tag whatchanged
  4. 4. simple checkout commit diff fetch init log merge status tag add
  5. 5. What's a DVCS? <ul>VCS – Version Control System - Tracks work Branches – flit about; fix a bug; add a feature Central VCS – share with a team Mature – want to go back to a 'stable' version to fix bugs? Easy. Distributed VCS? What does that bring? </ul>
  6. 6. VCS for Communities <ul>Everyone has their own VCS 'server' – repository You can work totally offline Capable of fetching changes from other people's repos Usually one person has the master repo for a project and they pull changes Any group of people can exchange code-changes between themselves </ul>
  7. 7. But I'm all on my own... <ul>That's fine... git is a great VCS for single users <ul>Rapid branching allows you to context switch Useful gui for seeing the history </ul>You never know when you'll find a friend or several </ul>
  8. 8. But we all work together That's good – if you want to support different workflows you can do that. <ul><ul><li>Shared central repository </li></ul><ul><li>Integration managed </li></ul><ul><li>Hierarchical integration </li></ul></ul>
  9. 9. Gitorious and Branches
  10. 10. Gitorious and Branches
  11. 11. Gitorious and Branches
  12. 12. Key Benefits Super easy branches Fast Always available Very compact Team player Flexible usage Easy to use gitk Gitorious
  13. 13. Hope that's whetted your interest... <ul>Listen to Johan's talk about Gitorious Come to the workshop and talk about how you use git Thanks David Greaves / lbt </ul>

×