EECS 470 Lab 4. Version Control System. Friday, 31 st January, 2014
|
|
|
- Sybil Snow
- 6 years ago
- Views:
Transcription
1 EECS 470 Lab 4 Version Control System Department of Electrical Engineering and Computer Science College of Engineering University of Michigan Friday, 31 st January, 2014 (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
2 Overview Administrivia Git VCS Basics Distributed VCS Git Preliminaries Assignment (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
3 Administrivia Administrivia Homework Homework 2 is due Monday, 3 rd February at the beginning of lecture If you haven t, you need to get started now Projects Project 3 is due Sunday, 9 th February at 9:00PM We are available to answer questions on anything here. Office hours can be found in the course google calendar. (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
4 VCS Basics Version Control Systems What is a version control system? Stores text files Keeps old versions around Allows parallel work Why do I care? Prevents/helps prevent loss of data (nothing is foolproof) Great for group work Required for Project 3 (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
5 VCS Basics History of VCS Motivation Avoid having isr.v.old isr.v.old2 isr.v.working isr.v.really_working A Short History 1950 Manual file naming 1982 Revision Control System Local 1986 Concurrent Versions System 2000 Subversion Central 2005 Git Distributed (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
6 Distributed VCS Centralized VCS What does it mean to be centralized? Clients talk to a server, which is the one, true version Server copy keeps history Clients have a(n) (incomplete) working copy (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
7 Distributed VCS Distributed VCS VCS Structure Centralized (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
8 Distributed VCS Distributed VCS What does it mean to be distributed? Every copy is created equal (can all act as the server) No one, true version (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
9 Distributed VCS Distributed VCS VCS Structure Distributed (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
10 Distributed VCS Hybrid VCS The Hybrid Approach Use a DVCS Set up a server to be the synchronization point Possibly still connect directly to colleagues, but generally not (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
11 Distributed VCS Distributed VCS VCS Structure Hybrid (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
12 Git Preliminaries Subsection 3 Git Preliminaries (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
13 Git Preliminaries Secure Shell What is ssh? Secured remote connection to a server, e.g. Remote shell How git (should) communicate(s) with other machines What do I need to know? Requires that you identify yourself: Key (RSA or DSA) Password (keyboard-interactive) Kerberos (gssapi-with-mic) Necessary for Bitbucket (coming up) (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
14 Git Preliminaries Secure Shell: Keys SSH Keys Public-private key pair authentication Can also be password protected ssh-keygen Creates /.ssh/id_rsa (your private key) and /.ssh/id_rsa.pub (your public key) (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
15 Git Preliminaries Example: ssh-keygen ~] $ ssh-keygen -t rsa -b 4096 Generating public/private rsa key pair. Enter file in which to save the key (/home/wcunning/.ssh/id_rsa): Enter passphrase (empty for no passphrase): Enter same passphrase again: Your identification has been saved in /home/wcunning/.ssh/id_rsa. Your public key has been saved in /home/wcunning/.ssh/id_rsa.pub. The key fingerprint is: 3f:91:f9:7f:d7:be:4e:62:56:27:88:1d:3a:5d:b4:56 wcunning@dahak The key's randomart image is: +--[ RSA 4096] E. o. + B = S B o.+...o.o + o= (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
16 Git Preliminaries Git Configuration Follow Along Run the following commands: git config --global user.name Your Name git config --global user. Optionally: Download wcunning-dotfiles.tar.gz Open it up Copy.gitconfig and.gitignore to your home directory Optionally copy other configs/google those programs (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
17 Git Preliminaries Bitbucket What is Bitbucket? Free, online git repositories More friendly to private repos than Github What do I need to know? Used for Project 3 and the final project You need to make an account, right now Once you have an account, add it to this spreadsheet How to make a Bitbucket account... (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
18 Example Execution ~] $ git clone git@bitbucket.org:eecs470staff/course_material.git Cloning into 'course_material'... Warning: Permanently added the RSA host key for IP address ' ' to the list of known hosts. remote: Counting objects: 183, done. remote: Compressing objects: 100% (166/166), done. remote: Total 183 (delta 39), reused 0 (delta 0) Receiving objects: 100% (183/183), KiB 0 bytes/s, done. Resolving deltas: 100% (39/39), done. Checking connectivity... done [wcunning@dahak Documents] $ cd course_material/ [wcunning@dahak project1] [master] $ vim projects/project1/testd.v [wcunning@dahak project1] [master *] $ git add projects/project1/testd.v [wcunning@dahak project1] [master +] $ git commit [master 4caae96] Updated Project 1 to clock); 1 file changed, 11 insertions(+), 11 deletions(-) [wcunning@dahak project1] [master] $ git push Counting objects: 10, done. Delta compression using up to 4 threads. Compressing objects: 100% (5/5), done. Writing objects: 100% (5/5), 544 bytes 0 bytes/s, done. Total 5 (delta 3), reused 0 (delta 0) To git@bitbucket.org:eecs470staff/course_material.git da0cf7a..4caae96 master -> master (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
19 Git Basics Introduction Structure For each command you need to know, we will 1. Occasionally, an aside with a Git Concept we need to describe a command 2. Describe the command, along with any useful flags/options 3. Show how the command affects the repositories 4. Show an example with output (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
20 Git Diagram Git Repo Structure Commit Tree [origin] HEAD=9a12490 Mark HEAD=9a12490 Will HEAD=9a a12490 (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
21 Git Commands: clone What does git clone do? Makes a copy of a repository Syntax and Options Example: git clone <protocol>:/<repo> <directory> Clones the repo at <repo> into <directory> Repos can be accessed through several different protocols Git: Unsecured, do not use HTTP(S): Used for freely available things, but push should use the secured version SSH: The right answer, always secure, likely passwordless (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
22 Git Diagram Git Repo Structure Commit Tree [origin] HEAD=9a12490 Mark HEAD=9a12490 Jon HEAD=9a12490 Will HEAD=9a a12490 (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
23 Git Commands by Example: clone ~] $ git clone git@bitbucket.org:eecs470staff/course_material.git Cloning into '.'... remote: Counting objects: 79, done. remote: Compressing objects: 100% (68/68), done. remote: Total 79 (delta 13), reused 0 (delta 0) Receiving objects: 100% (79/79), KiB, done. Resolving deltas: 100% (13/13), done. (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
24 Git Concepts: Working Copy vs. Local Repo What is the working copy? The files/folders you actually operate on e.g. group1/ What is the local repo? The hidden folder containing the stored history for the repo e.g. group1/.git/ Consequences.git/ directory is a full repo Useful in the event that you needed a backup Commits get stored here Synchronization with the remote is explicit (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
25 Git Concepts: Remotes What is a remote? Remotes are bookmarked repositories to synchronize with Consequences Clone automatically creates a remote named origin, which is the default for all remote operations (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
26 Git Diagram Git Repo Structure Commit Tree [origin] HEAD=9a12490 Mark HEAD=9a12490 Jon* HEAD=9a12490 Will HEAD=9a a12490 (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
27 Git Concepts: Tracked Files What does it mean for a file to be tracked? Files that are tracked are stored in the repository Consequences Untracked files have no history Tracked files can be compared for changes Files can be ignored (.gitignore) (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
28 Git Commands: status What does git status do? Shows the contents of the staging area Shows the files with differences to the most recent commit Shows the files untracked by git Syntax and Options Example: git status (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
29 Git Commands by Example: status slides] [master *] $ git status # On branch master # Changes not staged for commit: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # modified: eecs470lab4slides.tex # (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
30 Git Commands: add What does git add do? If a file is untracked it becomes tracked Otherwise, the current version is taken as a snapshot and added to the staging area Syntax and Options Example: git add <files> <files> can be any normal shell file structure (globs, wildcards, directories, etc.) if <files> has a directory, it is added recursively git add interactive: Lets you add files and parts of files from the status output interactively; possibly good for commit building after a complex set of changes (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
31 Git Diagram Git Repo Structure Commit Tree [origin] HEAD=9a12490 Mark HEAD=9a12490 Jon+ HEAD=9a12490 Will HEAD=9a a12490 (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
32 Git Commands by Example: add slides] [master *] $ git add eecs470lab4slides.tex [jbbeau@dahak slides] [master +] $ git status # On branch master # Changes to be committed: # (use git reset HEAD <file>..." to unstage # # modified: eecs470lab4slides.tex # (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
33 Git Concepts: Snapshots What is a snapshot? git add doesn t follow a file in perpetuity Instead, it saves a snapshot (the state of the file at the time the command was called) Consequences Files need to be added every time they are changed Can add only certain files to a commit (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
34 Git Concepts: The Staging Area What is the staging area? Contains the snapshots to be used in creating the next commit Consequences Commits can be built thematically Commits can be relatively small, even if changes to be committed are large (useful for git bisect) (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
35 Git Commands: commit What does git commit do? Combines everything in the staging area into a commit, described by your log message Adds it all to the local repo Points at it with a commit hash Changes HEAD to point at that commit hash Syntax and Options Example: git commit Interesting things are possible with commit hooks (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
36 Git Ettiquette: Commits What is a good commit? Informative message short one liner followed by thorough paragraphs describing all of the changes Thematic all of the changes should go together logically (e.g. added a module and integrated it) Small keeping your changes small makes it easier to find what broke everything by binary searching the commit history (bisect) Why? All of these rules make it easier to find bugs and understand the progression of a project Most are mandatory at companies (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
37 Git Diagram Git Repo Structure Commit Tree [origin] HEAD=9a12490 Mark HEAD=9a12490 Jon Will HEAD=9a12490 f2ea0f5 9a12490 (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
38 Git Commands by Example: commit slides] [master +] $ git commit [master f2ea0f5] Lab 4 diagram change 1 file changed, 1 insertion(+), 1 deletion(-) (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
39 Git Commands: push What does git push do? Puts all of your local commits on some remote Syntax and Options Example: git push Defaults to pushing the master branch to the origin repo Interesting things are possible with push hooks (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
40 Git Diagram Git Repo Structure Commit Tree [origin] Mark HEAD=9a12490 Jon Will HEAD=9a12490 f2ea0f5 9a12490 (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
41 Git Commands by Example: push slides] [master] $ git push Counting objects: 11, done. Delta compression using up to 8 threads. Compressing objects: 100% (5/5), done. Writing objects: 100% (6/6), 475 bytes 0 bytes/s, done. Total 6 (delta 3), reused 0 (delta 0) To git@bitbucket.org:eecs470staff/course_material.git 9a f2ea0f5 master -> master (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
42 Git Commands: pull What does git pull do? Gets all commits from some remote This is actually a combination of git fetch followed by git merge Syntax and Options Example: git pull Defaults to pulling the master branch from the origin repo (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
43 Git Diagram Git Repo Structure Commit Tree [origin] Mark Jon Will f2ea0f5 9a12490 (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
44 Git Commands by Example: pull course_material] [master] $ git pull remote: Counting objects: 13, done. remote: Compressing objects: 100% (7/7), done. remote: Total 8 (delta 2), reused 0 (delta 0) Unpacking objects: 100% (8/8), done. From bitbucket.org:eecs470staff/course_material 9a f2ea0f5 master -> origin/master (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
45 Git Diagram Git Repo Structure Commit Tree [origin] Mark Jon Will* f2ea0f5 9a12490 (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
46 Git Commands: reset What does git reset do? Replaces modified files in the working directory with the versions in the local repo (at some commit hash, generally) Syntax and Options Example: git reset <hash> <file> Replaces the contents of <file> with the version in <hash> <hash> can be specified in relation the HEAD (e.g. HEAD 3) (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
47 Git Diagram Git Repo Structure Commit Tree [origin] Mark Jon Will f2ea0f5 9a12490 (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
48 Git Commands by Example: reset slides] [master *] $ git status # On branch master # Changes not staged for commit: # (use "git add/rm <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # deleted: beamerthemelab.sty # no changes added to commit (use "git add" and/or "git commit -a") [wcunning@mycroft-holmes slides] [master *] $ git reset --hard HEAD is now at f2ea0f5 Lab 4 diagram change (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
49 Git Commands: branch What does git branch do? Creates a pointer to a particular commit hash, future commits update this pointer Syntax and Options Example: git branch <branchname> Creates a branch named <branchname> starting at the current HEAD (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
50 Git Commands: checkout What does git checkout do? Moves the working directory to the specified commit hash or pointer to a commit hash Syntax and Options Example: git checkout <hash> <hash> can be an older commit (e.g. HEAD 2) a branch, or other pointer, (e.g. lab4) (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
51 Git Diagram Git Repo Structure Commit Tree [origin] Mark Jon Will f2ea0f5 9a12490 (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
52 Git Commands by Example: branch, checkout slides] [master] $ git branch lab4 [wcunning@mycroft-holmes slides] [master] $ git status On branch master Your branch is up-to-date with 'origin/master'. [wcunning@mycroft-holmes slides] [master] $ git checkout lab4 Switched to branch 'lab4' (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
53 Git Diagram Git Repo Structure Commit Tree [origin] Mark Jon Will* f2ea0f5 9a12490 (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
54 Git Diagram Git Repo Structure Commit Tree [origin] Mark Jon Will+ f2ea0f5 9a12490 (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
55 Git Diagram Git Repo Structure Commit Tree [origin] 8e4bab6 Mark Jon Will HEAD=8e4bab6 f2ea0f5 9a12490 (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
56 Git Diagram Git Repo Structure Commit Tree [origin] 8e4bab6 Mark* Jon Will HEAD=8e4bab6 f2ea0f5 9a12490 (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
57 Git Diagram Git Repo Structure Commit Tree [origin] 8e4bab6 Mark+ Jon Will HEAD=8e4bab6 f2ea0f5 9a12490 (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
58 Git Diagram Git Repo Structure Commit Tree [origin] 8e4bab6 b73416d Mark HEAD=b73416d Jon Will HEAD=8e4bab6 f2ea0f5 9a12490 (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
59 Git Diagram Git Repo Structure Commit Tree [origin] 8e4bab6 b73416d Mark* HEAD=b73416d Jon Will HEAD=8e4bab6 f2ea0f5 9a12490 (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
60 Git Diagram Git Repo Structure Commit Tree [origin] 8e4bab6 b73416d Mark+ HEAD=b73416d Jon Will HEAD=8e4bab6 f2ea0f5 9a12490 (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
61 Git Diagram Git Repo Structure Commit Tree [origin] 4b3d3cb 8e4bab6 b73416d Mark HEAD=4b3d3cb Jon Will HEAD=8e4bab6 f2ea0f5 9a12490 (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
62 Git Diagram Git Repo Structure Commit Tree [origin] HEAD=4b3d3cb 4b3d3cb 8e4bab6 b73416d Mark HEAD=4b3d3cb Jon Will HEAD=8e4bab6 f2ea0f5 9a12490 (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
63 Git Diagram Git Repo Structure Commit Tree [origin] HEAD=4b3d3cb 4b3d3cb 8e4bab6 b73416d Mark HEAD=4b3d3cb Jon Will* HEAD=8e4bab6 f2ea0f5 9a12490 (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
64 Git Diagram Git Repo Structure Commit Tree [origin] HEAD=4b3d3cb 4b3d3cb 8e4bab6 b73416d Mark HEAD=4b3d3cb Jon Will+ HEAD=8e4bab6 f2ea0f5 9a12490 (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
65 Git Diagram Git Repo Structure Commit Tree [origin] HEAD=4b3d3cb 06505f6 4b3d3cb 8e4bab6 b73416d Mark HEAD=4b3d3cb Jon Will HEAD=06505f6 f2ea0f5 9a12490 (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
66 Git Diagram Git Repo Structure Commit Tree [origin] HEAD=4b3d3cb 06505f6 4b3d3cb 8e4bab6 b73416d Mark HEAD=4b3d3cb Jon Will HEAD=06505f6 f2ea0f5 9a12490 (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
67 Git Commands: merge What does git merge do? Combines two branches (when used manually) Can mangle a repository Can have conflicts Syntax and Options Example: git merge lab4 Merges the lab4 branch into the current branch git mergetool helps you handle merge conflicts See me in office hours if you need to do this... (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
68 Git Diagram Git Repo Structure Commit Tree a [origin] HEAD=4b3d3cb 06505f6 4b3d3cb 8e4bab6 b73416d Mark HEAD=4b3d3cb Jon Will HEAD=a f2ea0f5 9a12490 (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
69 Git Commands by Example: merge slides] [master $] $ git merge lab4 Updating f2ea0f5..25cbbce Fast-forward.gitignore labs/lab4/assignment/tex/eecs470lab4assignment.tex 2 +- labs/lab4/slides/eecs470lab4slides.tex labs/lab4/slides/script.txt labs/lab4/slides/ssh-keygen.txt files changed, 841 insertions(+), 11 deletions(-) create mode gitignore create mode labs/lab4/slides/script.txt create mode labs/lab4/slides/ssh-keygen.txt (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
70 Git Commands: tag What does git tag do? Creates an additional pointer to a particular commit hash Syntax and Options Example: git tag -a <tagname> <hash> Creates a pointer to <hash> called <tagname> This pointer can be checked out just like a branch Tags are local by default, push with git push <tagname> (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
71 Git Diagram Git Repo Structure Commit Tree lab4 a [origin] HEAD=4b3d3cb 06505f6 4b3d3cb 8e4bab6 b73416d Mark HEAD=4b3d3cb Jon Will HEAD=a f2ea0f5 9a12490 (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
72 Git Commands by Example: merge w14] [master] $ git tag -a lab4-release HEAD [wcunning@mycroft-holmes w14] [master] $ git push origin lab4-release Counting objects: 1, done. Writing objects: 100% (1/1), 187 bytes 0 bytes/s, done. Total 1 (delta 0), reused 0 (delta 0) To git@bitbucket.org:eecs470staff/course_material.git * [new tag] lab4-release -> lab4-release [wcunning@mycroft-holmes w14] [master] $ git tag -l lab4-release (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
73 Assignment Lab Assignment Assignment is posted to the course website as Lab 4 Assignment. If you get stuck... Ask a neighbor, quietly Put yourself in the help queue Note: Unlike most labs, to get checked off for this one, you will also need to have made your Bitbucket account and entered it in the spreadsheet. When you finish the assignment, sign up in the help queue and mark that you would like to be checked off. If you are unable to finish today, the assignment needs to be checked off by a GSI in office hours before the next lab session. (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
74 Bitbucket Guide Bitbucket Account Setup 1. Go to Bitbucket Sign Up 2. Fill out the form. Preferably, use your uniqname as your username Use address Choose Personal Account 3. Click on the little silhouette of a person in the upper right corner. 4. Select Manage Account from the list. 5. Click on SSH Keys in the list on the left. 6. Click on Add Key. 7. In the pop up, paste the contents of /.ssh/id_rsa.pub, and name the key whatever you would like. 8. Add your Bitbucket username to the spreadsheet. (University of Michigan) Lab 4: VCS Friday, 31 st January, / 62
EECS 470 Lab 4. Version Control System. Thursday, 27 th September, 2018
EECS 470 Lab 4 Version Control System Department of Electrical Engineering and Computer Science College of Engineering niversity of ichigan Thursday, 27 th September, 2018 (niversity of ichigan) Lab 4:
GETTING STARTED WITH. Michael Lessard Senior Solutions Architect June 2017
GETTING STARTED WITH Michael Lessard Senior Solutions Architect June 2017 Agenda What is Git? Installation of Git Git basis Github First steps with Git 2 WHAT IS GIT? What is Git? Started in 2005 Created
Git. Charles J. Geyer School of Statistics University of Minnesota. Stat 8054 Lecture Notes
Git Charles J. Geyer School of Statistics University of Minnesota Stat 8054 Lecture Notes 1 Before Anything Else Tell git who you are. git config --global user.name "Charles J. Geyer" git config --global
Version Control with GIT
Version Control with GIT Benjamin Roth CIS LMU München Benjamin Roth (CIS LMU München) Version Control with GIT 1 / 30 Version Control Version control [...] is the management of changes to documents, computer
FEEG Applied Programming 3 - Version Control and Git II
FEEG6002 - Applied Programming 3 - Version Control and Git II Richard Boardman, Sam Sinayoko 2016-10-19 Outline Learning outcomes Working with a single repository (review) Working with multiple versions
Git Guide. Meher Krishna Patel. Created on : Octorber, 2017 Last updated : October, More documents are freely available at PythonDSP
Git Guide Meher Krishna Patel Created on : Octorber, 2017 Last updated : October, 2018 More documents are freely available at PythonDSP Table of contents Table of contents i 1 Commands Summary 1 2 Git
Revision control. INF5750/ Lecture 2 (Part I)
Revision control INF5750/9750 - Lecture 2 (Part I) Problem area Software projects with multiple developers need to coordinate and synchronize the source code Approaches to version control Work on same
Introduction to Git and Github
Introduction to Git and Github Computing in Optimization and Statistics: Lecture 1 Jackie Baek MIT January 10, 2017 What is git and GitHub? git is a version control system. Other version control systems
2 Initialize a git repository on your machine, add a README file, commit and push
BioHPC Git Training Demo Script First, ensure that git is installed on your machine, and you have configured an ssh key. See the main slides for instructions. To follow this demo script open a terminal
Revision Control and GIT
Revision Control and GIT On UD HPC Community Clusters William Totten Network & Systems Services Why use revision control You can go back in time It makes it easy to try things out which might not work
Git. Presenter: Haotao (Eric) Lai Contact:
Git Presenter: Haotao (Eric) Lai Contact: haotao.lai@gmail.com 1 Acknowledge images with white background is from the following link: http://marklodato.github.io/visual-git-guide/index-en.html images with
git commit --amend git rebase <base> git reflog git checkout -b Create and check out a new branch named <branch>. Drop the -b
Git Cheat Sheet Git Basics Rewriting Git History git init Create empty Git repo in specified directory. Run with no arguments to initialize the current directory as a git repository. git commit
Git for Newbies. ComMouse Dongyue Studio
Git for Newbies ComMouse Dongyue Studio 2018.4.25 Contents What is Git? Git Quick Start Git Branch Git Workflow Git in Practice What is Git? What is Git? A Version Control System (VCS) An Open-sourced
Version Control System - Git. zswu
Version Control System - Git zswu Overview Why VCS? Why Git? Using Git Personally Using Git with Others Etiquette Rules of Using Git Tools & Services Tips 2 Why VCS (1/3) How do you manage your homework?
USPAS Simulation of Beam and Plasma Systems Steven M. Lund, Jean-Luc Vay, Remi Lehe, Daniel Winklehner and David L. Bruhwiler Lecture: Software Version Control Instructor: David L. Bruhwiler Contributors:
CSE 391 Lecture 9. Version control with Git
CSE 391 Lecture 9 Version control with Git slides created by Ruth Anderson & Marty Stepp, images from http://git-scm.com/book/en/ http://www.cs.washington.edu/391/ 1 Problems Working Alone Ever done one
git Version: 2.0b Merge combines trees, and checks out the result Pull does a fetch, then a merge If you only can remember one command:
Merge combines trees, and checks out the result Pull does a fetch, then a merge If you only can remember one command: git --help Get common commands and help git --help How to use git
Introduction to distributed version control with git
Institut für theoretische Physik TU Clausthal 04.03.2013 Inhalt 1 Basics Differences to Subversion Translation of commands 2 Config Create and clone States and workflow Remote repos Branching and merging
Git for Version Control
Git for Version Control These slides are heavily based on slides created by Ruth Anderson for CSE 390a. Thanks, Ruth! images taken from http://git-scm.com/book/en/ http://www.cs.washington.edu/403/ About
Windows. Everywhere else
Git version control Enable native scrolling Git is a tool to manage sourcecode Never lose your coding progress again An empty folder 1/30 Windows Go to your programs overview and start Git Bash Everywhere
Submitting your Work using GIT
Submitting your Work using GIT You will be using the git distributed source control system in order to manage and submit your assignments. Why? allows you to take snapshots of your project at safe points
So#ware(Project. Lecture'4. Wouter'Swierstra. So#ware(project( (Lecture(4 1
So#ware(Project Lecture'4 Wouter'Swierstra So#ware(project( (Lecture(4 1 Last%&me Risks So(ware-architecture So#ware(project( (Lecture(4 2 Working(effec,vely(with(git(and(GitHub. So#ware(project( (Lecture(4
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
Software Project (Lecture 4): Git & Github
Software Project (Lecture 4): Git & Github Wouter Swierstra, Atze Dijkstra Feb 2016 Wouter Swierstra, Atze Dijkstra Software Project (Lecture 4): Git & Github Feb 2016 1 / 45 Wouter Swierstra, Atze Dijkstra
A Brief Introduction to Git. Sylverie Herbert (based on slides by Hautahi Kingi)
A Brief Introduction to Git Sylverie Herbert (based on slides by Hautahi Kingi) Introduction Version control is better than mailing files back and forth because: Nothing that is committed to version control
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
Index. Alias syntax, 31 Author and commit attributes, 334
Index A Alias syntax, 31 Author and commit attributes, 334 B Bare repository, 19 Binary conflict creating conflicting changes, 218 during merging, 219 during rebasing, 221 Branches backup, 140 clone-with-branches
CPSC 491. Lecture 19 & 20: Source Code Version Control. VCS = Version Control Software SCM = Source Code Management
CPSC 491 Lecture 19 & 20: Source Code Version Control VCS = Version Control Software SCM = Source Code Management Exercise: Source Code (Version) Control 1. Pretend like you don t have a version control
Git and GitHub. Dan Wysocki. February 12, Dan Wysocki Git and GitHub February 12, / 48
Git and GitHub Dan Wysocki February 12, 2015 Dan Wysocki Git and GitHub February 12, 2015 1 / 48 1 Version Control 2 Git 3 GitHub 4 Walkthrough Dan Wysocki Git and GitHub February 12, 2015 2 / 48 Version
Computer Science Design I Version Control with Git
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
Version Control System GIT
Version Control System GIT Version Contol System Version (revision) control systems are software that help you track changes you make in your code over time. As you edit to your code, you tell the version
213/513/613 Linux/Git Bootcamp. Cyrus, Eugene, Minji, Niko
213/513/613 Linux/Git Bootcamp Cyrus, Eugene, Minji, Niko Outline 1. SSH, bash, and navigating Linux 2. Using VIM 3. Setting up VS Code 4. Git SSH 1. On macos/linux: $ ssh ANDREW-ID@shark.ics.cs.cmu.edu
Working in Teams CS 520 Theory and Practice of Software Engineering Fall 2018
Working in Teams CS 520 Theory and Practice of Software Engineering Fall 2018 Version Control September 18, 2018 Thursday (September 20) First in-class exercise On using git (today is a prelude with useful
Version Control Systems
Version Control Systems Version Control In the 2 nd edition of Pro Git, version control is described as a system that records changes to a file or set of files over time so that you can recall specific
Version Control. Second level Third level Fourth level Fifth level. - Software Development Project. January 17, 2018
Version Control Click to edit Master EECS text 2311 styles - Software Development Project Second level Third level Fourth level Fifth level January 17, 2018 1 But first, Screen Readers The software you
Versioning with git. Moritz August Git/Bash/Python-Course for MPE. Moritz August Versioning with Git
Versioning with git Moritz August 13.03.2017 Git/Bash/Python-Course for MPE 1 Agenda What s git and why is it good? The general concept of git It s a graph! What is a commit? The different levels Remote
Using Git to Manage Source RTL
Using Git to Manage Source RTL CS250 Tutorial 1 (Version 082311) August 24, 2011 Brian Zimmer How to use this tutorial This class will be using Git for all of the labs and projects. This will allow the
Effective Programming Practices for Economists. 7. Version Control, Part II: Git with a Shared Repository
Effective Programming Practices for Economists 7. Version Control, Part II: Git with a Shared Repository Hans-Martin von Gaudecker Department of Economics, Universität Bonn Collaboration Science in general
Chapter 5. Version Control: Git
Chapter 5 Version Control: Git The Replication Crisis continues to heat up discussion across social science. Hence principled researchers want to make their work easy to replicate and reputable journals
Git, the magical version control
Git, the magical version control Git is an open-source version control system (meaning, it s free!) that allows developers to track changes made on their code files throughout the lifetime of a project.
Git Tutorial. Version: 0.2. Anders Nilsson April 1, 2014
Git Tutorial Version: 0.2 Anders Nilsson andersn@control.lth.se April 1, 2014 1 Introduction Why use git, or any other version control software to keep track of files? In short there are at least three
History...: Displays a window of Gitk, a standard commit viewer for Git.
Git Services Wakanda includes Git features that will help you manage the evolution of your solutions and files. These features are designed to share code as well as to handle multi developer projects and
Eugene, Niko, Matt, and Oliver
213/513 Linux/Git Bootcamp Eugene, Niko, Matt, and Oliver outline 1. ssh but also Windows ssh client especially 2. bash commands + navigating Linux 3. VIM and VS Code 4. Git how to ssh 1. on OS X/Linux:
Object Oriented Programming. Week 1 Part 2 Git and egit
Object Oriented Programming Part 2 Git and egit Lecture Review of Git Local Repository Remote Repository Using Git from Eclipse Review of Git 3 What is Git? Software Configuration Management (SCM) Supports
About the Tutorial. Audience. Prerequisites. Copyright & Disclaimer. Gerrit
Gerrit About the Tutorial Gerrit is a web-based code review tool, which is integrated with Git and built on top of Git version control system (helps developers to work together and maintain the history
Git. CSCI 5828: Foundations of Software Engineering Lecture 02a 08/27/2015
Git CSCI 5828: Foundations of Software Engineering Lecture 02a 08/27/2015 1 Lecture Goals Present a brief introduction to git You will need to know git to work on your presentations this semester 2 Git
Git: Distributed Version Control
Git: Distributed Version Control Computer Science and Engineering College of Engineering The Ohio State University Lecture 3 Demo Prep: Empty (but initialized) repo Linear development: Create, edit, rename,
Common Git Commands. Git Crash Course. Teon Banek April 7, Teon Banek (TakeLab) Common Git Commands TakeLab 1 / 18
Common Git Commands Git Crash Course Teon Banek theongugl@gmail.com April 7, 2016 Teon Banek (TakeLab) Common Git Commands TakeLab 1 / 18 Outline 1 Introduction About Git Setup 2 Basic Usage Trees Branches
Introduction to Git and GitHub for Writers Workbook February 23, 2019 Peter Gruenbaum
Introduction to Git and GitHub for Writers Workbook February 23, 2019 Peter Gruenbaum Table of Contents Preparation... 3 Exercise 1: Create a repository. Use the command line.... 4 Create a repository...
Effective Software Development and Version Control
Effective Software Development and Version Control Jennifer Helsby, Eric Potash Computation for Public Policy Lecture 5: January 19, 2016 computationforpolicy.github.io Announcements Do look at the readings
Version Control: Gitting Started
ting Started Cai Li October 2014 What is Version Control? Version control is a system that records changes to a file or set of files over time so that you can recall specific versions later. Local Version
What is version control? (discuss) Who has used version control? Favorite VCS? Uses of version control (read)
1 For the remainder of the class today, I want to introduce you to a topic we will spend one or two more classes discussing and that is source code control or version control. What is version control?
A quick (and maybe practical) guide to Git and version control. By Jay Johnson
A quick (and maybe practical) guide to Git and version control By Jay Johnson Necessary shout outs and reference links from slides from CSE 380 with Dr. Chris Simmons (UT-Austin) and notes from Prof. Jean-Luc
GIT tutorial. David Parsons, Soraya Arias, Thomas Calmant November, Preamble 2
GIT tutorial David Parsons, Soraya Arias, Thomas Calmant November, 2017 Contents 1 Preamble 2 2 First steps 2 2.1 Basic configuration.......................................... 2 2.2 Create your very first
CS314 Software Engineering Configuration Management
CS314 Software Engineering Configuration Management Dave Matthews Configuration Management Management of an evolving system in a controlled way. Version control tracks component changes as they happen.
Use git rm to remove files from workspace
More Git: Removing files from the repository Branches, tags, merge conflicts Pull requests CPSC 491 First: Get up to speed from last time Removing files from your workspace Use git rm to remove files from
Git! Fundamentals. IT Pro Roundtable! June 17, 2014!! Justin Elliott! ITS / TLT! Classroom and Lab Computing!! Michael Potter!
Git! Fundamentals IT Pro Roundtable! June 17, 2014!! Justin Elliott! ITS / TLT! Classroom and Lab Computing!! Michael Potter! IT Communications 1 What is Version Control? Version Control System (VCS)!
GIT. A free and open source distributed version control system. User Guide. January, Department of Computer Science and Engineering
GIT A free and open source distributed version control system User Guide January, 2018 Department of Computer Science and Engineering Indian Institute of Technology, Kharagpur Table of Contents What is
Lecture 6 Remotes. Sign in on the attendance sheet!
Lecture 6 Remotes Sign in on the attendance sheet! Midterm Review Everyone did great! What We ve Learned So Far Creating and cloning repositories git init, git clone Linear commit histories and diffs git
git the SCM system Jan-Simon Möller training.linuxfoundation.org
git the SCM system Jan-Simon Möller training.linuxfoundation.org Topics What is git (what is a SCM) How to install git How to personalize git How to use git for development What is git? What is a SCM System?
Fundamentals of Git 1
Fundamentals of Git 1 Outline History of Git Distributed V.S Centralized Version Control Getting started Branching and Merging Working with remote Summary 2 A Brief History of Git Linus uses BitKeeper
CS 520: VCS and Git. Intermediate Topics Ben Kushigian
CS 520: VCS and Git Intermediate Topics Ben Kushigian https://people.cs.umass.edu/~rjust/courses/2017fall/cs520/2017_09_19.zip Our Goal Our Goal (Overture) Overview the basics of Git w/ an eye towards
GUIDE TO MAKE A REAL CONTRIBUTION TO AN OPEN SOURCE PROJECT 1. 1
GUIDE TO MAKE A REAL CONTRIBUTION TO AN OPEN SOURCE PROJECT 1. 1 WHO AM I? @tushar_rishav GSoC'16 student contributing to coala - a static code analysis tool, under Python So ware Foundation. A senior
Introduction to Git. Let us list below some of the best known and most widely used version control systems:
Introduction to Git 1 Version Control Systems Whenever you are working on a non-trivial project, keeping track of all the changes to your files and being able to undo some of them, if necessary, is vital.
Assumptions. GIT Commands. OS Commands
Many of the world s largest dev teams have adopted Git and it s not hard to see why It can handle small and large projects easily It has a tiny footprint It outclasses other version control tools It s
Version Control. Second level Third level Fourth level Fifth level. - Software Development Project. January 11, 2017
Version Control Click to edit Master EECS text 2311 styles - Software Development Project Second level Third level Fourth level Fifth level January 11, 2017 1 Scenario 1 You finished the assignment at
Version Control with Git ME 461 Fall 2018
Version Control with Git ME 461 Fall 2018 0. Contents Introduction Definitions Repository Remote Repository Local Repository Clone Commit Branch Pushing Pulling Create a Repository Clone a Repository Commit
Git tutorial. Katie Osterried C2SM. October 22, 2015
Git tutorial Katie Osterried C2SM October 22, 2015 Outline 1 What is Git and why are we switching? 2 Working with Git 3 Branching and Merging 4 Working with remote repositories 5 Recommendations Outline
License. Introduction to Version Control with Git. Local Version Control Systems. Why Use Version Control?
License Introduction to Version Control with Git Andreas Skielboe 1 Adapted by Dr. Andrew Vardy 2 All images adapted from Pro Git by Scott Chacon and released under license Creative Commons BY-NC-SA 3.0.
6 Git & Modularization
6 Git & Modularization Bálint Aradi Course: Scientific Programming / Wissenchaftliches Programmieren (Python) Prerequisites Additional programs needed: Spyder3, Pylint3 Git, Gitk KDiff3 (non-kde (qt-only)
CS 390 Software Engineering Lecture 5 More Git
CS 390 Software Engineering Lecture 5 More Git Reference: Scott Chacon and Ben Straub, Pro Git, published by Apress, available at https://git-scm.com/book/en/v2. Outline Finish local repository Remote
Tools for software development:
Tools for software development: Version Control System Source Control Management Repository commit An introduction push Data Processing Course, V. Lafage, IPN Orsay V. Lafage @ Data Processing Course 2019
GIT. CS 490MT/5555, Spring 2017, Yongjie Zheng
GIT CS 490MT/5555, Spring 2017, Yongjie Zheng GIT Overview GIT Basics Highlights: snapshot, the three states Working with the Private (Local) Repository Creating a repository and making changes to it Working
Git version control with Eclipse (EGit) Tutorial
Git version control with Eclipse (EGit) Tutorial 출처 : Lars Vogel http://www.vogella.com/tutorials/eclipsegit/article.html Lars Vogel Version 3.6 Copyright 2009, 2010, 2011, 2012, 2013, 2014 Lars Vogel
How to be a git. Dominic Mitchell
How to be a git Dominic Mitchell Git! It s new! Everybody s talking about it! What is it? Distributed Version Control Why Git? Fast Local Toolkit Widely used Github Toolkit lets other people build tools
Improving Your Life With Git
Improving Your Life With Git Lizzie Lundgren elundgren@seas.harvard.edu Graduate Student Forum 26 April 2018 Scenarios to Avoid My code was deleted from 90-day retention! Crap, I can t remember what I
GETTING TO KNOW GIT: PART II JUSTIN ELLIOTT PENN STATE UNIVERSITY
GETTING TO KNOW GIT: PART II JUSTIN ELLIOTT PENN STATE UNIVERSITY 1 REVERTING CHANGES 2 REVERTING CHANGES Change local files git reset git checkout Revert a commit in the branch history git revert Reset
Tutorial: Getting Started with Git. Introduction to version control Benefits of using Git Basic commands Workflow
Tutorial: Getting Started with Git Introduction to version control Benefits of using Git Basic commands Workflow http://xkcd.com/1597/ 2 Tutorial Objectives Fundamentals of how git works Everything you
Version control system (VCS)
Version control system (VCS) Remember that you are required to keep a process-log-book of the whole development solutions with just one commit or with incomplete process-log-book (where it is not possible
DEAD-SIMPLE VERSION CONTROL FOR YOUR TEAM GIT WITH MATTHEW REIDSMA GRAND VALLEY STATE UNIVERSITY
DEAD-SIMPLE VERSION CONTROL FOR YOUR TEAM WITH GIT MATTHEW REIDSMA GRAND VALLEY STATE UNIVERSITY WHO DOESN T USE VERSION CONTROL? VERSION CONTROL WHO? OH BOY. WHY YOU NEED VERSION CONTROL GIT GIT WHY GIT
Git: Distributed Version Control
Git: Distributed Version Control Computer Science and Engineering College of Engineering The Ohio State University Lecture 3 What Does "D" Stand For? Distributed version control Multiple people, distributed
Outline. Version Control System (VCS) basics Git terminology & concepts Basic Git commands Branches in Git Git over the network (time permitting)
Outline Version Control System (VCS) basics Git terminology & concepts Basic Git commands Branches in Git Git over the network (time permitting) Why do I need version control? How many lines of code was
Introduction to Git. Database Systems DataLab, CS, NTHU Spring, 2018
Introduction to Git Database Systems DataLab, CS, NTHU Spring, 2018 1 Outline Version control system Git basics Git branch Remote repository 2 Outline Version control system Git basics Git branch Remote
GIT FOR SYSTEM ADMINS JUSTIN ELLIOTT PENN STATE UNIVERSITY
GIT FOR SYSTEM ADMINS JUSTIN ELLIOTT PENN STATE UNIVERSITY 1 WHAT IS VERSION CONTROL? Management of changes to documents like source code, scripts, text files Provides the ability to check documents in
What is Secure. Authenticated I know who I am talking to. Our communication is Encrypted
Crypto App - SSH 1 What is Secure Authenticated I know who I am talking to Our communication is Encrypted Telnet clear text Servers Terminal clear text Routers SSH encrypted channel encrypted text Servers
Code and data management with Git
Code and data management with Git Git and remote repositories Jonathan K. Vis Department of Human Genetics Remote repositories Table of contents Remote repositories Transferring commits between repositories
Lab Exercise Git: A distributed version control system
Lunds tekniska högskola Datavetenskap, Nov 21, 2016 EDAF45 Programvaruutveckling i grupp projekt Labb 2 (Git): Labbhandledning Checked on Git versions: 2.7.4 Lab Exercise Git: A distributed version control
The Intro. Aaron Bartell Director of IBM i Innovation. Copyright 2015 Aaron Bartell
The Intro Aaron Bartell Director of IBM i Innovation albartell@krengeltech.com Copyright 2015 Aaron Bartell This session brought to you by... Consulting - Jumpstart your open source pursuit. Small and
Version control CSE 403
Version control CSE 403 Goals of a version control system Keep a history of your work Explain the purpose of each change Checkpoint specific versions (known good state) Recover specific state (fix bugs,
Gitting things done. Hands-on introduction to git niceties. Jan Urbański Ducksboard
Gitting things done Hands-on introduction to git niceties Jan Urbański jan@ducksboard.com Ducksboard Atlassian Git Party, Madrid, September 25, 2012 Jan Urbański (Ducksboard) Gitting things done Atlassian
CSE 344: Section 1 Git Setup for HW Introduction to SQLite. September 28, 2017
CSE 344: Section 1 Git Setup for HW Introduction to SQLite September 28, 2017 1 Administrivia HW1 due on GitLab on Tuesday, October 3rd at 11:00 P.M. WQ1 due on Gradiance on Friday, October 6th at 11:59
Version Control. Software Carpentry Github s Hello World Git For Ages 4 And Up You need source code control now
A version control system (VCS) is a tool or system for keeping track of changes in files. A primitive form of VCS would be making a copy of a file every time you want to make a new version of the file.
What is git? Distributed Version Control System (VCS); Created by Linus Torvalds, to help with Linux development;
What is git? Distributed Version Control System (VCS); Created by Linus Torvalds, to help with Linux development; Why should I use a VCS? Repositories Types of repositories: Private - only you and the
DEVNET Introduction to Git. Ashley Roach Principal Engineer Evangelist
DEVNET-1080 Introduction to Git Ashley Roach Principal Engineer Evangelist Twitter: @aroach Email: asroach@cisco.com Cisco Spark How Questions? Use Cisco Spark to communicate with the speaker after the
VCS VERSION CONTROL SYSTEMS
VCS VERSION CONTROL SYSTEMS http://goo.gl/1tc7oh http://waynelkh.github.io/sa-git 1 WHO AM I? NCTU-CSCC TA wnlee 2 WHAT IS "VERION CONTROL" Version control is a system that records changes to a file or
From Commits to Collaboration: A Git Tutorial for Social Scientists
From Commits to Collaboration: A Git Tutorial for Social Scientists Paul Sangrey, University of Pennsylvania December 12, 2017 The Replication Crisis continues to heat up discussion across social science.
Git Introduction CS 400. February 11, 2018
Git Introduction CS 400 February 11, 2018 1 Introduction Git is one of the most popular version control system. It is a mature, actively maintained open source project originally developed in 2005 by Linus
John DeDourek Professor Emeritus Faculty of Computer Science University of New Brunswick GIT
John DeDourek Professor Emeritus Faculty of Computer Science University of New Brunswick GIT What is Git? A source code control system Implies program code A version control system Implies any sort of
Using Git For Development. Shantanu Pavgi, UAB IT Research Computing
Using Git For Development Shantanu Pavgi, pavgi@uab.edu UAB IT Research Computing Outline Version control system Git Branching and Merging Workflows Advantages Version Control System (VCS) Recording changes
EECS 470 Lab 5. Linux Shell Scripting. Friday, 1 st February, 2018
EECS 470 Lab 5 Linux Shell Scripting Department of Electrical Engineering and Computer Science College of Engineering University of Michigan Friday, 1 st February, 2018 (University of Michigan) Lab 5: