Git: a representation

288 views

Published on

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
288
On SlideShare
0
From Embeds
0
Number of Embeds
1
Actions
Shares
0
Downloads
1
Comments
0
Likes
0
Embeds 0
No embeds

No notes for slide

Git: a representation

  1. 1. GIT Get started to use Git
  2. 2. Git Real Video
  3. 3. GIT compares with SVN decentralization vs centeralization revision system repository structure standard process
  4. 4. Create a new Repo git init:
  5. 5. File life cycle Untracked Git doesn't know about these files Tracked, unmodifed Git knows about them, and there have been no changes. Tracked, modified File is in git, but changes have been made that git doesn't know about. Staged Changes to this file will be committed next time you commit.
  6. 6. Staging & Commitgit status, git add, git diff, git commit
  7. 7. Undo git commit –amend, git reset
  8. 8. You just learned…...how to add new files to the repository. ...how to stage and commit new changes. ...how to check the status of your current changes. ...how to undo changes to files and amend commits.
  9. 9. Remotes 1 create a repo ( github ) cloning a repo ( github ) git remote add origin, git push –u origin master, git clone
  10. 10. Remotes 2 push pull & conflict
  11. 11. You just learned… ...how to create a new repository in github. ...how to clone remote repos and push changes to them. ...how to deal with merge conflicts.
  12. 12. Branches Part I What is branches A branch is really just a seperated version of your code. E.g., A 'pretty' version of your paper, vs. one you're overhauling. In technical terms, it is a pointer to a commit commit Repo: revisit
  13. 13. Branches Part 2 A branch is a pointer to a commit
  14. 14. Branches Part 3 The files in our working directory reflect HEAD
  15. 15. Branches Part 4 Two branches can point to the same commit
  16. 16. Branches Part 5 Move HEAD with checkout
  17. 17. Branches Part 6 New commits move the HEAD branch
  18. 18. Merge 1 A merge scenario
  19. 19. Merge 2 Another merge scenario
  20. 20. Using branches and tags
  21. 21. You just learned… What tags and branches are. How to make one. How to merge changes from one branch onto another branch.
  22. 22. Git Flow Branching Strategy Standard process: http://nvie.com/posts/a-successful-git-branching- model/ The software tool SourceTree : http://www.sourcetreeapp.com/ Master, Develop, Feature branches
  23. 23. Other advanced features http://pan.baidu.com/s/1mgiEKQ0 Reset rebase

×