Computer Science Design I Version Control with Git

Size: px

Start display at page:

Download "Computer Science Design I Version Control with Git"

Richard McGee
6 years ago
Views:

1 Computer Science Design I Version Control with Git Department of Electrical Engineering & Computer Science Information Technology & Telecommunications Research Center The University of Kansas annguyen@ittc.ku.edu ResiliNets

2 Version Control with Git Outline Version control system Bitbucket Homework 11 September 2013 EECS581 - Computer Science Design 2

3 Version Control with Git Version Control System Version control system Bitbucket Homework 11 September 2013 EECS581 - Computer Science Design 3

4 Version Control System Overview Version Control System (VCS): record changes to files over time user who makes the modification time modification made revert files/project back to previous state 3 types of VCS: local version control systems centralized version control systems distributed version control systems 11 September 2013 EECS581 - Computer Science Design 4

5 Version Control System Local Version Control Systems Database: keep all changes to files under revision control [1] 11 September 2013 EECS581 - Computer Science Design 5

Multiple clients checkout files from server [1] 11

6 Version Control System Centralized Version Control Systems Central server: keep all versioned files Multiple clients checkout files from server [1] 11 September 2013 EECS581 - Computer Science Design 6

7 Version Control System Distributed Version Control Systems Clients fully mirror the server [1] 11 September 2013 EECS581 - Computer Science Design 7

8 Version Control System Open-Source VCSs CVS: SVN: Git: Mercurial: Bazaar: LibreSource: Monotone: 11 September 2013 EECS581 - Computer Science Design 8

9 Version Control with Git Version control system Bitbucket Homework 11 September 2013 EECS581 - Computer Science Design 9

10 History Developed by Linux community Linus Torwalds, Linux creator Design goals fast simple strongly support non-linear development fully distributed able to handle large projects 11 September 2013 EECS581 - Computer Science Design 10

11 Git Stores Snapshots Data stored as snapshots upon commit, modified files stored again unmodified files have links to previous files [1] 11 September 2013 EECS581 - Computer Science Design 11

12 Most Operations Are Local Entire history of project stored on local disk operations performed locally no network latency overhead work can be done offline 11 September 2013 EECS581 - Computer Science Design 12

13 Data Integrity Everything in Git is check-summed SHA-1 hash 40-hexadecimal character string allow Git to detect file corruption Very difficult to lose data after committed lost data can be recovered 11 September 2013 EECS581 - Computer Science Design 13

14 3 sections git dir The Three Sections and Three States working dir staging area 3 states committed modified staged [1] 11 September 2013 EECS581 - Computer Science Design 14

15 The Three Sections and Three States Git directory metadata and object database for project copied when cloning a repository from another computer Working directory single checkout of 1 version of project pulled from Git dir Staging area single file in Git dir contain info about files for next commit 11 September 2013 EECS581 - Computer Science Design 15

16 The Three Sections and Three States A file is considered as committed stored in Git dir (local database) modified changed since checkout not been staged or saved in Git dir staged changed since checkout been staged 11 September 2013 EECS581 - Computer Science Design 16

17 config files: /etc/gitconfig Setup contain values for all users and their repositories to read/write: pass --system to git config ~/.gitconfig specific to user to read/write: pass --global to git config.git/config config file in Git dir specific to repository 11 September 2013 EECS581 - Computer Science Design 17

18 Setup Identity $ git config --global user.name Your Name $git config --global user. < > Editor (Vim is the default) $ git config --global core.editor <editor> DiffTool $ git config --global merge.tool <merge-tool> Check settings $ git config --list $ git config user.name 11 September 2013 EECS581 - Computer Science Design 18

19 Getting Help form Manual Page $ git help <verb> $ git <verb> --help $ man git-<verb> 11 September 2013 EECS581 - Computer Science Design 19

20 Initialize a repository $ git init Getting a Git Repository Clone an existing repository $ git clone [url] 11 September 2013 EECS581 - Computer Science Design 20

21 File Status Untracked files not in previous snapshot Check file status $ git status [1] 11 September 2013 EECS581 - Computer Science Design 21

22 Tracking new files $ git add <filename> Staging modified files $ git add <filename> Ignoring files Recording Changes set up.gitignore file containing patterns Viewing changes in detail show unstaged changes: $ git diff all staged changes: $ git diff --staged $ git diff --cached 11 September 2013 EECS581 - Computer Science Design 22

23 Committing changes $ git commit Recording Changes $ git commit m message Skipping staging area $ git commit a m message Removing files from working dir and staging area $ git rm <filename> from staging area only $ git rm --cached <filename> 11 September 2013 EECS581 - Computer Science Design 23

24 Recording Changes Moving files $ git mv <file-from> <file-to> equivalent to $ mv <file-from> <file-to> $ git rm <file-from> $ git add <file-to> 11 September 2013 EECS581 - Computer Science Design 24

25 $ git log Options Viewing Commit History -p shows diff in each commit --word-diff shows word diff instead of line by line diff --stat shows stats for each commit --pretty changes log output format oneline, short, full, fuller, format Limit log output with options -<n> shows the last n commits --since, --until --grep searches for keywords in commit messages 11 September 2013 EECS581 - Computer Science Design 25

26 Change last commit $ git commit amend Unstage staged file Undoing $ git reset HEAD <filename> Unmodify modified file $ git checkout -- <filename> dangerous command: all changes made to the file gone 11 September 2013 EECS581 - Computer Science Design 26

27 Show remote servers $ git remote v Add remote repositories Working with Remotes $ git remote add <shortname> <url> Fetch and pull from remotes $ git pull origin master Push to remotes $ git push origin master need write access to the server you cloned from nobody pushing in the meantime 11 September 2013 EECS581 - Computer Science Design 27

28 Working with Remotes Inspect remotes $ git remote show <remote-name> Rename remotes $ git remote rename <old-name> <new-name> Remove remotes $ git remote rm <remote-name> 11 September 2013 EECS581 - Computer Science Design 28

29 Version Control with Git Bitbucket Version control system Bitbucket Homework 11 September 2013 EECS581 - Computer Science Design 29

30 Version Control with Git Bitbucket Hosting site for Git and Mercurial Online tutorial: 11 September 2013 EECS581 - Computer Science Design 30

31 Version Control with Git Homework Version control system Bitbucket Homework 11 September 2013 EECS581 - Computer Science Design 31

32 Version Control with Git Homework Create a Bitbucket account Send me an your first and last name yout Bitbucket username and/or used to set up your account 11 September 2013 EECS581 - Computer Science Design 32

33 References [1] Pro Git. [2] Bitbucket. [3] 7 Version Control Systems Reviewed September 2013 EECS581 - Computer Science Design 33

Version control with Git.

Version control with Git. 1 Version control with Git http://git-scm.com/book/en/ Basic Intro to Git We will: Discuss how Git differs from Subversion Discuss the basic Git model Pull/clone files from a repository on github Edit