Git
Download as PPTX, PDF1 like1,016 views
Git is an open source distributed version control system designed for speed and efficiency. It allows developers to work simultaneously and independently of an internet connection by keeping a local copy of the code repository. Changes are committed locally and then pushed to a remote repository to share work. Git uses branches to isolate work, enabling features to be developed separately from the main code without disrupting the primary version. This makes it possible for hotfixes to be applied without affecting ongoing work.
Git
- 1. Git
- 3. Version Control System • A way to keep track of changes to files (& folders) • Between multiple authors (developers) • A record of “who” did “what”, “when” • “Why”, is provided by commit messages
- 4. Version Control System (Types) • Centralized (Subversion, CVS) • Server has the master repository, all commits go to the server • Distributed (Git, Mercurial) • Server has the master repository, but you have a copy (clone) of the repository on your machine
- 5. Git is…
- 6. Git is… • An open source VCS designed for speed and efficiency • Created by Linus Torvalds (for managing Linux kernel) • Hosted solutions include Github.com (more expensive) or Bitbucket.com (cheaper) • or running your own Git server
- 7. Moreover Git is… • An open source, distributed version control software designed for speed and efficiency • Revisions (commits) you make to your local repository are available to you only • The next time you connect to the internet, push your changes to a remote repository to share them
- 8. How it woks… Remote Repo Working Directory Index Repository "Staging" "a copy of your project" git add git commit git push / git pull internet your pc "your clone of the remote repo" your edits git clone
- 9. Git usages
- 10. Git usages : Understanding Git Workflow Obtain a repository Make some edits Stage your changes Commit your work Push to server Git init Git clone Git pull git commitgit add git push Git pull
- 11. edits git add git add git add edits editsgit commit git commit git commit Repo Work Stage Repo Work Stage Repo Work Stage Repo --> time --> Origin git clone git pull Origin git push (git init) internet your pc
- 12. Git usages : Branches •Why do branches matter? An example to illustrate... • Monday: You put all the client's code into a repo, clone it locally • Tuesday: You create a branch to implement a new feature, making several commits
- 13. Git usages : Branches • Wednesday: You realize that it would be better to split out the feature into a couple different include files, so you create 2 new files and delete the old one. You commit your work. • Thursday: The client contacts you frantically wanting a hot fix for an issue discovered on the version of the code on the live site.
- 14. Git usages : Branches •What do you do now? • You deleted their version of the file on Wednesday, right? • No! You made a branch. • Their original file is in the master branch still!
- 15. Git usages : Branches • Why: • Try out an idea - experiment • Isolate work units - keep unfinished work separate • Work on long-running topics - come back to things later • Share your work in progress with others without altering the code in production or in development (remote feature branches)
- 16. Branch Workflow git branch "Branch" git checkout Branch git checkout Master git merge Branch edits git add git add git add edits edits git commit git commit git commit Master Branch Work Stage Branch Work Stage Branch Work Stage Master Branch --> time --> Origin git clone git pull Origin git push internet your pc
- 17. vs
- 18. • Centralized Version Control Systems (DVCS) Central, authoritative repository All changes saved in one single location • Distributed Version Control Systems (DVCS) Clients can make changes in the repositories and those changes will be local to them.
- 19. SVN Dataflow Git Data Flow Working Dir Remote Repository
- 20. Online Source Control User must be online in order to commit to the repository from the working copy. Offline Source Control Clients can commit changes to their localized repositories as new revisions even while being offline
- 21. Longer time to store because all of the data is stored in a centralized repository. Extremely Fast Complete copy of the data is stored locally in the client’s system
- 22. SVN help is more organized There is some time wasted since it is difficult to get a quick reference from Git’s search.
- 23. Creating and working on branch/Merge is complex and difficult to use Simple and Easy to use branch and Merge The working directory of a developer is itself a branch.
- 24. Sequencial Commits Data is lost when simultaneous commits of two or more working copies are performed Non-Sequencial Commits Large number of users can put data to the same repository No need to worry about data lost or immediate merging of others changes
- 25. Revision Tracking SVN keeps record of files File history is lost on renaming Fixed by giving a file unique long lived id Revision Tracking Git keeps track of contents. Even a small change in content it tracks it as a separate change.
- 26. Particially Checkout Checkouts at subdirectory level are possible. Only Full Checkout Git will not allow you to checkout a subdirectory.
- 27. Simple usablity Simpler to learn • create, commit and checkout Single central "master-repository” Complex usablity Two modes of creating repositories • checkout vs. clone • commit vs. push. Git has more concepts and more commands. many Git commands are cryptic, and error messages are very user-unfriendly
- 28. Projects using SVN Projects using Git BitBucket Gitorious Codeplex
- 30. Thank you for your attention