version control with git - lucydot.github.io · configuring git • git config creating a...

Version Control with Git Imperial College London 14.11.19 Instructor: Lucy Helpers: Santiago and Amit Slides: lucydot.github.io/slides/

Upload: others

Post on 10-Oct-2020

152 views

Category:

Documents

1 download

Report

Download

Embed Size (px):

TRANSCRIPT

Page 1: Version Control with Git - lucydot.github.io · Configuring Git • git config Creating a repository • git init, git status Tracking the changes to your files • git add, git commit,

Version Control with GitImperial College London

14.11.19

Instructor: LucyHelpers: Santiago and Amit

Slides: lucydot.github.io/slides/

http://lucydot.github.io/slides/

Page 2: Version Control with Git - lucydot.github.io · Configuring Git • git config Creating a repository • git init, git status Tracking the changes to your files • git add, git commit,

What is a version control system?Version control systems keep track of every change to a file over time

so that earlier versions can be restored

• You can compare between different versions of your project• There is a written log of the changes made

• There are merge tools if projects diverge• You can see who made which changes and when

• You can share your work on GitHub or GitLab• Your repository is backed up

What are the features of Git?

Page 3: Version Control with Git - lucydot.github.io · Configuring Git • git config Creating a repository • git init, git status Tracking the changes to your files • git add, git commit,

CommitSnapshot of your project at a particular point in time

RepositoryThe history of all your project’s commits

OutlineConfiguring Git

• git config

Creating a repository• git init, git status

Tracking the changes to your files• git add, git commit, git log

Exploring your project’s history• git diff, git show, git checkout

Sharing your work with others• git remote, git push, git pull

Collaborating with others• git clone

Page 5: Version Control with Git - lucydot.github.io · Configuring Git • git config Creating a repository • git init, git status Tracking the changes to your files • git add, git commit,

Wolfman and Dracula have been hired by Universal Missions to investigate if it is possible to set up a new base on Mars.

Page 6: Version Control with Git - lucydot.github.io · Configuring Git • git config Creating a repository • git init, git status Tracking the changes to your files • git add, git commit,

Get everything “in frame” for the photo

Take the photo and add to the photo album

Page 7: Version Control with Git - lucydot.github.io · Configuring Git • git config Creating a repository • git init, git status Tracking the changes to your files • git add, git commit,

Page 8: Version Control with Git - lucydot.github.io · Configuring Git • git config Creating a repository • git init, git status Tracking the changes to your files • git add, git commit,

Index/ cache

Page 9: Version Control with Git - lucydot.github.io · Configuring Git • git config Creating a repository • git init, git status Tracking the changes to your files • git add, git commit,

Page 10: Version Control with Git - lucydot.github.io · Configuring Git • git config Creating a repository • git init, git status Tracking the changes to your files • git add, git commit,

Basic collaboration workflow

Update your local repo

Make your changes and stage them

Commit your changes

Upload the changes to GitHub

git pull origin master

git add

git commit -m

git push origin master

Page 11: Version Control with Git - lucydot.github.io · Configuring Git • git config Creating a repository • git init, git status Tracking the changes to your files • git add, git commit,

The collaborator The owner (who created the repository)

Adds collaborator via GitHub

Accepts invitation (https://github.com/owner/repository/invitations)

Clones onto local machine

Makes changes and pushes to GitHub remote (git add, git commit, git push origin master)

Page 12: Version Control with Git - lucydot.github.io · Configuring Git • git config Creating a repository • git init, git status Tracking the changes to your files • git add, git commit,

The collaborator The owner (who created the repository)

Adds collaborator via GitHub

Accepts invitation (https://github.com/owner/repository/invitations)

Clones onto local machine

Makes changes and pushes to GitHub remote (git add, git commit, git push origin master)

Makes changes (to same line as collaborator) and tries to push to GitHub remote (git add, git commit, git push origin master)

Pulls from GitHub remote(git pull origin master)

ERROR

AUTO-MERGE FAILED

Fixes conflict in file and pushes merged file to GitHub remote(git add, git commit, git push origin master)

Page 13: Version Control with Git - lucydot.github.io · Configuring Git • git config Creating a repository • git init, git status Tracking the changes to your files • git add, git commit,

Github is used for all sortsCV eg: https://github.com/bbrattoli/bbrattoli.github.io

Websites eg: https://github.com/kbroman/kbroman.github.io

Teachingeg: https://github.com/aronwalsh

Publishingeg: https://joss.theoj.org/papers/10.21105/joss.01824

https://github.com/bbrattoli/bbrattoli.github.io

https://github.com/kbroman/kbroman.github.io

https://github.com/aronwalsh

https://joss.theoj.org/papers/10.21105/joss.01824

SummaryConfiguring Git

• git config

Creating a repository• git init, git status

Tracking the changes to your files• git add, git commit, git log

Exploring your project’s history• git diff, git show, git checkout

Sharing your work with others• git remote, git push, git pull

Collaborating with others• git clone

Page 15: Version Control with Git - lucydot.github.io · Configuring Git • git config Creating a repository • git init, git status Tracking the changes to your files • git add, git commit,

Next, you could…• Create a repository for your code and publish it using GitHub

• Use Git to version control your next paper (please encourage your colleagues to come to the next software carpentry sessions)

• Signup for free private GitHub repositories or use Imperial GitHub Enterprise (github.ic.ac.uk)

• Learn about branching

• Try out a Git GUI: http://git-scm.com/downloads/gui

• Attend a research computing drop-in session (Tuesdays 2-4pm)

“We learn from failure, not from success!”9am start tomorrow: PYTHON

slides: lucydot.github.io/slides/

http://lucydot.github.io/slides/

Version control with git - schluppeck.github.io · git config ‐‐global user.name "First Last" # your name git config ‐‐global user.email "[email protected]" # your email This info

Objectif Prérequis · $ git config --global user.email [email protected] Bob importe un projet $ tar xzf project.tar.gz $ cd project $ git init $ git add . $ git commit

Git verstehen und nutzen - PKQSpkqs.net/~sbeyer/tmp/pre-git-clt09.pdf · git config --global user.email ’[email protected]’ Subjektiv, aber erw ahnenswert (Doku ): git config --global

GIT & GITHUB · 2019-11-26 · $ git init: git 저장소(Repository) 생성, 작업하는 환경의 가장 상위폴더에서 실행 GIT으로 버전 관리 시작하기: git init

Introduction to Git - GitHub Pages€¦ · $ git config --global user.name "Daniel Lin" $ git config --global user.email "[email protected]" $ git config --global color.ui "auto"

Version control - GitHub Pages · Git basics - Part 3 Add version control using Git to working directory initialise our new repository in the working directory git init check hidden

Lab 2: Git€¦ · Git: creare un repository 2 • git init • Solitamente il primo comando ad essere eseguito per inizializzare un repository vuoto • Uso $ git init • Trasforma

Git Fundamentos · Git. Fundamentos. Guion de comandos 27/10/2015 2 Primeros pasos 2.1 Ayuda git # Distintas formas de obtener ayuda git help init git init --help man git init man

Git 青出於藍、更勝於藍epaper.gotop.com.tw/pdf/ACA024600.pdfgit config --system user.name ‘操作者姓名’ git config --system user.email ‘操作者email’ 也就是說，我們是利用「git

25/01/2014...Configuración Sistema /etc/gitconfig git config --system Usuario ~/.gitconfig git config --global Repositorio .git/config git config --local git log man git-log git log

Git - Single Repository - Drexel Universitykschmidt/CS265/Lectures/Git/git-single.pdfGit - Single Repository Kurt Schmidt Intro First Repository git init git add ... The Actual Repository

PowerPoint Presentation€¦ · $ git init $ git add $ git status $ git commit $ git push $ git pull $ git clone • • • • • • • • $ sudo apt-get install

Johan Herland €¦ · The Git Parable Git - simple & powerful git init git add … git commit … git branch … git checkout … git tag … git diff …

Git for Hackathons - kevinchen.co · Download Git OS X Install Xcode Windows Install Cygwin Linux Use your package manager. git command options. Set up Git git config --global user.name

Git Version Control - UT Southwestern...$ git config --global user.name "John Doe" $ git config --global user.email [email protected] If you dont do this your history will be very

András Veres-Szentkirályi 2018-08-24+_0x7e2.pdf · git init mkdir a b echo foo >a/alpha echo bar >b/beta git add . git commit -m first echo qux >b/bravo git add . git commit -m

Gitbaker/swe2/restricted/notes/gitintro.pdf · – add, delete, rename, commit • Getting information – status, diff, log ... Repository files • .git/config • .git/description

Git, Jenkins & Chuck - georgik.rocks · Configure git config --global user.name "Juraj Michalek" git config --global user.email "[email protected]"

Git Basics - Problem Solving Clubpsc.cpsc.ucalgary.ca/.../2016-10-21-GitBasics.pdfConfiguration Link to your GitHub account: git config --global user.name “Your Name” git config

Introduction to Git3. Initialize git (git init) 4. Add a file to the stage (git add) 5. Commit (git commit -m’’) 6. Change file and commit changes (git add & git

Git it - Deimos.fr · $ git config --global user.name "William Daniau" $ git config --global user.email [email protected] Certaines opérations lancent un éditeur de texte

[email protected] config --global user.name "Jesús Amieiro" git config --global user.email “[email protected]” ... touch .gitignore git status echo "arquivo_temporal.txt"

GIT - Brainscan · •git init command •Make this a git repository •Track all the files that come and go, changes that are made, and do it for all subfolders too •.git folder

maven git - Universität des Saarlandes · $ git checkout -t origin/olderState old $ git checkout olderState $ git clone sopra:gruppe8! •manuelle Konﬁguration: $ git config branch.myFeature.remote

Hands-on Git to Set Up Three Branchesgit config --global user.name “me”! git config --global user.email “me@work”! git config --global color.ui “auto”! ... • Edit .gitignore

Git: Introduction Commands. 1. Create a folder and change into it 2. git init Creating local git repository. Git and files • Git keeps track of files and changes within them •

Distributed Version Control with Git · Gitting Started Commands git init - Create an empty git repository or reinitialize an existing one git status - Show the working tree status

Distributed Version Controlweb.cse.ohio-state.edu/~joseph.97/courses/3901/lectures/lecture03.pdf$ git config --global user.name "Brutus Buckeye" $ git config --global user.email [email protected]

Git - osl.ugr.es€¦ · git config--global color.status auto git config--global color.branch auto git config--list SetUp. 27/ 45 [email protected] El fichero .gitignore del directorio

Lab 1: Git - Hanyang · 2020. 3. 26. · 1. git init 2. git remote add [repoName] [url] 3. git pull [repoName] [branch(e.g. master)] 4. Working… 5. git add * 6. git commit –m

Lab 1: Trello & Git · HelloGit.txt added to Remote Repository. Basic Work Flow 1. git init 2. git remote add [repoName] [url] 3. git pull [repoName] [branch(e.g. master)] 4

Praktische Aspekte der Informatik - graphics.tu-bs.de · Git Basics Initial checkout, and regular update to the newest version: git init / git clone / git pull Make changes:

Git LFS - acailly.github.io · $ git config --list [...] filter.lfs.clean=git-lfs clean -- %f filter.lfs.smudge=git-lfs smudge -- %f filter.lfs.process=git-lfs filter-process filter.lfs.required=true

Git - UFFleomurta/courses/2017.1/es2/aula5a.pdf · • git init – Cria um repositório Git no diretório • git add – Adiciona um arquivo na staging area para ser