Introduction to Git. Database Systems DataLab, CS, NTHU Spring, 2018

Size: px

Start display at page:

Download "Introduction to Git. Database Systems DataLab, CS, NTHU Spring, 2018"

Erin Lloyd
6 years ago
Views:

1 Introduction to Git Database Systems DataLab, CS, NTHU Spring,

2 Outline Version control system Git basics Git branch Remote repository 2

3 Outline Version control system Git basics Git branch Remote repository 3

4 What is Version Control? 4

5 Version Control System Store the projects, keep your revision history Synchronization between modifications made by different developers 5

6 Students VCS 6

7 How to work with others??? 7

8 Dropbox VCS in Reality 8

9 Outline Version control system Git basics Git branch Remote repository 9

10 Git Git is a version control system which is Fast Easy to use Distributed Able to handle large project (ex. Linux Kernel) A git repository is a mini database that tracks your files 10

11 Installation Please check this link Installing-Git 11

12 Configuration Modify ~/.gitconfig Or, type in following commands git config --global user.name your name git config --global user. For more information, please refer this link 12

13 Creating a new Repository Two ways to create a repository Initializing a Repository in an Existing Directory git init Cloning an Existing Repository We will talk about it later The repository information will be stored in the.git directory 13

14 Committing A Version Modifying Files Staging Modified Files (Add) Committing A Version 14

15 Committing A Version Staging (adding) a file git add [file name] Staging all files in the current directory git add -A Committing git commit -m [message] 15

16 Status Checking the current status and the current branch git status 16

17 A History Tree 13CD8E HEAD HEAD is a pointer pointing to the version you are looking at now 95165E 91DCA1 The versions you committed form a history tree B259F1 A9D013 17

18 Logs Listing the log git log Listing each log in one line git log --oneline 18

19 Checking Out A Version HEAD 13CD8E 95165E 91DCA1 git checkout 91DCA1 B259F1 A9D013 19

20 Outline Version control system Git basics Git branch Remote repository 20

21 Branches Master Branching Merging Develop Optimization A New Menu 21

22 The Master Branch HEAD Master 13CD8E A branch in Git is actually a label pointing to a version Master branch is the default branch created at the start time 95165E 91DCA1 B259F1 A9D013 22

23 Branching HEAD Master 13CD8E Feature 95165E HEAD 91DCA1 23

24 Branching 34F19D Master 13CD8E Feature 95165E HEAD 91DCA1 24

25 Branching 34F19D Feature Master 13CD8E HEAD 95165E 91DCA1 25

26 Branching 34F19D Feature Master 13CD8E HEAD 95165E 91DCA1 26

27 Branching 1F9D18 34F19D Feature Master 13CD8E HEAD 95165E 91DCA1 27

28 Git Branching Creating a new branch (label) git branch [branch name] Checking out the branch (move the HEAD) git checkout [branch name] Combining the above commands (create & checkout) git checkout -b [branch name] 28

29 Merging 3827FA 84091E Feature Master 1F9D18 34F19D HEAD 13CD8E 29

30 Git Merging Merging Steps Checking out a branch to merge git checkout [branch 1 name] Merging another branch git merge [branch 2 name] 30

31 Outline Version control system Git basics Git branch Remote repository 31

32 Collaboration with Git To work with others using git, you ll need a server that store the repository. Git is distributed, which means Everyone can store a copy of the repository downloaded from the server They can do their jobs independently 32

33 Collaboration workflow Server Clone Clone Local A 33 Local B

34 Collaboration workflow Server Commit New Local A 34 Local B

35 Collaboration workflow Server Push New Local A 35 Local B

36 Collaboration workflow New Server Push Pull New Local A 36 Local B

37 Cloning & Pushing Cloning the remote repositories git clone [Remote URL] The [Remote URL] is saved as Origin After committing a few versions, you can push the branch back to Origin git push -u origin [Branch Name] 37

38 Fetch & Pull Updating a branch from the remote repository Fetching the remote repository to local git fetch origin Merging the remote branch git merge origin/[branch Name] Doing above commands in one command git pull [Branch Name] 38

39 Fork 3827FA 84091E 1F9D18 34F19D 13CD8E The Repo. Under TA s Account 39

40 Fork 3827FA 3827FA 84091E 84091E 1F9D18 34F19D 1F9D18 34F19D 13CD8E 13CD8E The Repo. Under TA s Account The Repo. Under Your Account 40

Pull (Merge) Request 528A03 3827FA Pull Request 528A03 3827FA 84091E Accept 84091E 1F9D18

41 Pull (Merge) Request 528A FA Pull Request 528A FA 84091E Accept 84091E 1F9D18 34F19D 1F9D18 34F19D 13CD8E 13CD8E The Repo. Under TA s Account The Repo. Under Your Account 41

42 .gitignore File You can ignore some files that you don t want them to be tracked by editing the.gitignore file Remember to track and commit your.gitignore file Don t know what should be in.gitignore?

43 43

44 Reference Learn Git branching (interactive) Pro Git 寫給大家的 Git 教學 44

Lab 01 How to Survive & Introduction to Git. Web Programming DataLab, CS, NTHU

Lab 01 How to Survive & Introduction to Git Web Programming DataLab, CS, NTHU Notice These slides will focus on how to submit you code by using Git command line You can also use other Git GUI tool or built-in