About SJTUG. SJTU *nix User Group SJTU Joyful Techie User Group

Transcription

1 About SJTUG SJTU *nix User Group SJTU Joyful Techie User Group Homepage - SJTUG Mirrors - GitHub -

2 Git Basic Tutorial Zhou Fan SJTUG

3 What is Git Git is a free and open source distributed version control system Then what is GitHub/GitLab/BitBucket?

4 History of Git Maintenance of Linux kernel project patches and archived files BitKeeper (was not open-source) 2005 BitKeeper s free-of-charge status was revoked Linus developed Git

5 Why Git Great branching model Distributed Small & Fast

6 Get Started! Suppose we need to develop a project, say a program to calculate A + B Fix bugs / Add new features Collaborating with others We have Git installed

7 Getting a Git Repository Turn a local directory into a git repository git init Clone a remote git repository git clone

8 Staging Area Make Some Changes Change 1 Change 2 Change 3 Last Commit Working Directory Staging Area.git Directory

9 Staging Area Add Change 1 git add Change 2 Change 3 Last Commit Working Directory Staging Area.git Directory

10 Staging Area

11 Staging changes git status Check the status of the working directory git add git add <file> Stage change of <file> so that it would be included in the next commit

12 Commit changes git commit Confirm changes in the staging area Make a snapshot of the working directory (ignore changes not added)

13 Commit changes You may have to tell git who you are at the first time

14 git log

15 git reset Reset current HEAD to the specified commit git reset soft <commit>: leaves all your changed files "Changes to be committed" git reset hard <commit> discard any changes to tracked files since <commit> Commit Commit Commit Commit Commit HEAD

16 git reset Reset current HEAD to the specified commit git reset soft <commit>: leaves all your changed files "Changes to be committed" git reset hard <commit> discard any changes to tracked files since <commit> Commit Commit Commit Commit Commit HEAD

17 Undoing things Unstaging a staged file git rest HEAD <file>

18 Undoing things Unmodifying a modified file git checkout -- <file>

19 Remote repositories git remote add Add a remote repository to be tracked

20 git pull git pull <repository> <branch> Incorporates changes from a remote repository into the current branch

21 git pull git pull <repository> <branch> Incorporates changes from a remote repository into the current branch

22 Collaborate with others

23 git push git push <repository> <branch> Push local changes the remote repository

24 Oops! Merge conflicts

25 Resolving merge conflicts

26 Branching git branch <new branch> Create a new branch git checkout <branch> Switch to <branch> git branch d <branch> Delete <branch>

27 git stash Stash the changes in a dirty working directory away git stash git stash list git stash apply git stash clear

28 git merge git merge <branch> Merge <branch> into the current branch

29 git merge git merge <branch> Merge <branch> into the current branch A simple case

30 git merge git merge <branch> Merge <branch> into the current branch A simple case fast-forward merge

31 git merge git merge <branch> Merge <branch> into the current branch A not-that-simple case (There may be merge conflicts)

32 git merge git merge <branch> Merge <branch> into the current branch A not-that-simple case

33 Git workflow

34 git rebase Review: branch merging

35 git rebase Another way to do that: replay changes of experiment to master git checkout experiment git rebase master Or: git rebase master experiment

36 git rebase With merging

37 git rebase Fast-forward merge git checkout master git merge experiment

38 git rebase More complex rebasing

39 git rebase More complex rebasing git rebase onto master server client

40 git rebase More complex rebasing git checkout master git merge client (Fast-forward merge)

41 git rebase More complex rebasing git rebase master server

42 git rebase More complex rebasing git checkout master git merge server (Fast-forward merge)

43 git rebase A way to clean up your story rebase local changes you ve made before you share them then you push them

44 Reference Git Reference - Pro Git Book -

45 Thanks