Git
Download as PPTX, PDF0 likes466 views
This document provides an overview of version control systems and compares Git and SVN. It discusses why version control is useful, describes popular version control systems from the past and present, and highlights key differences between distributed (Git) and centralized (SVN) systems. The document also includes instructions for downloading, setting up, and using basic Git functions for managing a code repository, including commands for saving changes, inspecting history, undoing edits, syncing repositories, and working with branches.
Git
- 2. Why ? âą Easy code source management. âą Easy project management. âą Keep history of modifications (commits). âą Branches facilitates parallel tasks.
- 3. Version Control Solutions âą SCCS (1972) âą RCS (1982) âą CSV (1990) âą SVN (2000) âą GIT (2005) âą Mercurial (2005)
- 4. GIT vs SVN GIT âą Distributed version control system. âą Lot of local Repos. âą Diff is deltas (fast). âą Fast local operations. âą Fast remote operations. âą Internet connection needed only for push/pull. SVN âą Centralized revision control system. âą One central repo. âą Diff is files (slow). âą Slow local operations. âą Slow remote operations. âą Depends on internet connections. âą Depends on central repo.
- 5. GIT vs SVN
- 6. GIT vs SVN GIT SVN Repo Local Repo RemoteCommit Push Pull Repo RemoteCommit Update
- 7. Download & Install GIT âą On Windows https://git-for-windows.github.io/ âą On Linux / Mac http://www.alexgirard.com/git-book/commencement/installer-git/
- 8. Setting Up a Repository âą The git init command creates a new Git repository.
- 9. Setting Up a Repository âą git clone is primarily used to point to an existing repo and make a clone or copy of that repo at in a new directory, at another location.
- 10. Setting Up a Repository âą The git config command is a convenience function that is used to set Git configuration values on a global or local project level.
- 11. Saving Changes âą The git add command adds a change in the working directory to the staging area.
- 12. Saving Changes âą The git stash command takes your uncommitted changes (both staged and unstaged), saves them away for later use, and then reverts them from your working copy.
- 13. Inspecting a Depository âą The git status command displays the state of the working directory and the staging area.
- 14. Inspecting a Depository âą The git log command displays committed snapshots. It lets you list the project history, filter it, and search for specific changes.
- 15. Undoing Changes âą The git checkout command serves three distinct functions: checking out files, checking out commits, and checking out branches.
- 16. Undoing Changes âą The git revert command undoes a committed snapshot. But, instead of removing the commit from the project history, it generate a new commit that undoes all of the changes
- 17. Undoing Changes âą git reset is a versatile command with many configurations. It can be used to remove committed snapshots, although itâs more often used to undo changes in the staging area and the working directory.
- 18. Undoing Changes âą The git clean command removes untracked files from your working directory.
- 19. Rewriting History âą The git commit --amend command is a convenient way to fix up the most recent commit. It lets you combine staged changes with the previous commit instead of committing it as an entirely new snapshot.
- 20. Rewriting History âą The git rebase command allows you to easily change a series of commits, modifying the history of your repository. You can reorder, edit, or squash commits.
- 21. Syncing âą The git remote command lets you create, view, and delete connections to other repositories.
- 22. Syncing âą The git fetch command imports commits from a remote repository into your local repo
- 23. Syncing âą git pull runs git fetch with the given parameters and calls git merge to merge the retrieved branch heads into the current branch.
- 24. Syncing âą Use git push to push commits made on your local branch to a remote repository.
- 25. Branches âą Create and checkout branches :
- 26. Branches âą Merge branch into another branch :
- 27. Branches âą Rebase branch into another branch to keep a linear history of commits:
- 28. Branches âą Report commit from one branch to another branch:
- 29. Branches âą Remove branches from local and from remote repo:
- 30. Tags âą Create and remove Tags:
- 31. Good Practices âą Always sync local branch before push to remote:
- 32. Good Practices âą Always amend related commits into one commit to keep a good history:
- 33. Good Practices âą Always use interactive rebase to rewrite history to keep it clean (squash commits):
- 34. Good Practices âą Always create branch for every new features or bug fixing âą Always create pull request to merge the branch into master
- 35. References âą https://www.atlassian.com/git/tutorials âą https://help.github.com âą https://www.atlassian.com/dam/jcr:8132028b-024f- 4b6b-953e-e68fcce0c5fa/atlassian-git-cheatsheet.pdf
- 36. DEMO