Git. SSE2034: System Software Experiment 3, Fall 2018, Jinkyu Jeong

Transcription

1 Git Prof. Jinkyu Jeong TA -- Minwoo Ahn TA -- Donghyun Kim Computer Systems Laboratory Sungkyunkwan University SSE2034: System Software Experiment 3, Fall 2018, Jinkyu Jeong

2 Version Control System (VCS) Manage changes of documents, computer programs, and other collections of information Centralized revision control system Distributed revision control system server user A user A user B version database checkout file version database version database version 1 version 2 user B checkout version 1 version 2 version 1 version 2 version 3 file version 3 version 3 SSE2034: System Software Experiment 3, Fall 2018, Jinkyu Jeong (jinkyu@skku.edu) 2

3 Work flow on local repository Initialize repository Create or add files Commit files Modify files SSE2034: System Software Experiment 3, Fall 2018, Jinkyu Jeong 3

4 Install & Setup Install Linux : sudo apt-get install git Windows, Mac : download at User setup git config --global user.name name git config --global user. SSE2034: System Software Experiment 3, Fall 2018, Jinkyu Jeong (jinkyu@skku.edu) 4

5 Git basic command git init Create an empty Git repository or reinitialize an existing one git add filename Add file contents to the index git rm filename Remove files from the working tree and from the index git commit Record changes to the repository options -a : Tell the command to automatically stage files that have been modified -m msg : Use the given msg as the commit message git status Show the working tree status SSE2034: System Software Experiment 3, Fall 2018, Jinkyu Jeong (jinkyu@skku.edu) 5

6 Example $mkdir git_tutorial && cd git_tutorial ~/git_tutorial git init ~/git_tutorial vi hello.c ~/git_tutorial git add hello.c ~/git_tutorial git status ~/git_tutorial git commit ~/git_tutorial vi hello.c ~/git_tutorial git commit m Modify hello.c file SSE2034: System Software Experiment 3, Fall 2018, Jinkyu Jeong (jinkyu@skku.edu) 6

7 Git branch command git branch List, create, or delete branches options [-d] branchname : The name of the branch to create or delete git branch topic D topic A B C E master SSE2034: System Software Experiment 3, Fall 2018, Jinkyu Jeong (jinkyu@skku.edu) 7

8 Git branch command git checkout Checkout a branch or paths to the working tree options branchname : switch to branchname -b newbranch : create newbranch and switch D topic git checkout topic A B C E master 6a7b34... git checkout 6a7b34 SSE2034: System Software Experiment 3, Fall 2018, Jinkyu Jeong (jinkyu@skku.edu) 8

9 Git branch command git merge Join two or more development histories together options branchname : Reply the changes of branchname on top of current branch D G topic git merge topic B C E F H master SSE2034: System Software Experiment 3, Fall 2018, Jinkyu Jeong (jinkyu@skku.edu) 9

10 Conflict master #include <iostream> using namespace std; int main(void) { cout << Hello! << endl; cout << Master! << endl; } #include <iostream> using namespace std; int main(void) { cout << Hello! << endl; <<<<<<< HEAD cout << Master! << endl; ======= cout << Topic! << endl; >>>>>>> topic } topic #include <iostream> using namespace std; int main(void) { cout << Hello! << endl; cout << Topic! << endl; } git merge topic Fix conflict and commit SSE2034: System Software Experiment 3, Fall 2018, Jinkyu Jeong (jinkyu@skku.edu) 10

11 Git branch command git rebase Join two or more development histories together options git rebase upstream git rebase upstream branch git rebase onto newbase upstream branch D G topic git rebase master git rebase master topic B C E F master SSE2034: System Software Experiment 3, Fall 2018, Jinkyu Jeong (jinkyu@skku.edu) 11

12 Work flow on local repository Make new-branch Merge master & new-branch Checkout new-branch Checkout master branch Create or add files Commit files Modify files SSE2034: System Software Experiment 3, Fall 2018, Jinkyu Jeong 12

13 .gitignore Ignore auxiliary files such as logs, input/out data, etc Generate automatically at ~/git_tutorial git add.gitignore ~/git_tutorial git commit m added.gitignore file SSE2034: System Software Experiment 3, Fall 2018, Jinkyu Jeong (jinkyu@skku.edu) 13

14 Git log command git log Show commit logs options -p : Show all changes at each commit --stat : Show statistics about modified files at each commit --name-only : Show only modified file name at each commit --relative-date : Show commit log with relative date --graph : Draw a text-based graphical representation of the commit history SSE2034: System Software Experiment 3, Fall 2018, Jinkyu Jeong (jinkyu@skku.edu) 14

15 GitHub Remote repository (place of co-work) Sign up for GitHub Public repository for free user Functions Fork : Copy other user s repository Pull requests : Communication with users Issues : Discuss issues between users in repository Wiki : Create a structured record of repository SSE2034: System Software Experiment 3, Fall 2018, Jinkyu Jeong (jinkyu@skku.edu) 15

16 GitHub basic command git clone Copy remote repository to local repository ~/git_tutorial git clone SSE2034: System Software Experiment 3, Fall 2018, Jinkyu Jeong 16

17 GitHub basic command git remote Link local repository and remote repository options -v : Check the connection with local and remote repository add name url : Add a remote named name for the repository at url git push Push local repository contests to remote repository options repository : destination (name or url) --all : push all modified contents in local repository git diff Show changes between local and remote SSE2034: System Software Experiment 3, Fall 2018, Jinkyu Jeong (jinkyu@skku.edu) 17

18 GitHub basic command git fetch Fetch contents from remote repository options repository : name or url of remote repository --all : Fetch all contents from remote repository Local repository Remote repository (GitHub) Modified by other user Commit Push (fail) fetch merge Push (success) Updated by me SSE2034: System Software Experiment 3, Fall 2018, Jinkyu Jeong (jinkyu@skku.edu) 18

19 GitHub basic command git pull Fetch and integrate contents from remote repository options repository : name or url of remote repository --all : Fetch all contents from remote repository Local repository Remote repository (GitHub) Modified by other user Commit Push (fail) Pull Push (success) Updated by me SSE2034: System Software Experiment 3, Fall 2018, Jinkyu Jeong (jinkyu@skku.edu) 19

20 How to write a Git commit message 1. Separate subject from body with a blank line 2. Limit the subject line to 50 characters 3. Capitalize the subject line 4. Do not end the subject line with a period 5. Use the imperative mood in the subject line 6. Wrap the body at 72 characters 7. Use the body to explain what and why vs. how SSE2034: System Software Experiment 3, Fall 2018, Jinkyu Jeong (jinkyu@skku.edu) 20

21 Reference Pro Git 2 nd Edition How to write a git commit message Command git help ex) git checkout --help SSE2034: System Software Experiment 3, Fall 2018, Jinkyu Jeong (jinkyu@skku.edu) 21