Upload File

or: how i learned to stopy worrying and love source control · 7 repository full history and files...

  • Home
  • Documents
  • or: how I learned to stopy worrying and love source control · 7 Repository full history and files (.git) Working directory visible files outside .git Commit snapshot of project Index
39
Git & Github or: how I learned to stopy worrying and love source control Jan Nonnen

Upload: others

Post on 07-Aug-2020

0 views

Category:

Documents


0 download

Report

TRANSCRIPT

Page 1: or: how I learned to stopy worrying and love source control · 7 Repository full history and files (.git) Working directory visible files outside .git Commit snapshot of project Index

Git & Github or: how I learned to stopy worrying and love source control

Jan Nonnen

Page 2: or: how I learned to stopy worrying and love source control · 7 Repository full history and files (.git) Working directory visible files outside .git Commit snapshot of project Index

3

Allow rewinding changes

Easier to collaborate

See when something changed

Why use version control?

Page 3: or: how I learned to stopy worrying and love source control · 7 Repository full history and files (.git) Working directory visible files outside .git Commit snapshot of project Index

4

Torvalds - Replacement of BitKeeper for Kernel dev

Design Goals:

Distributed workflow

Protection again data corruption

Performance

History

Page 4: or: how I learned to stopy worrying and love source control · 7 Repository full history and files (.git) Working directory visible files outside .git Commit snapshot of project Index

5

No central server necessary

Every copy contains full history

Every repository (copy) is equal

Most operations don‘t require network

Distributed?

Page 5: or: how I learned to stopy worrying and love source control · 7 Repository full history and files (.git) Working directory visible files outside .git Commit snapshot of project Index

Terminology

Page 6: or: how I learned to stopy worrying and love source control · 7 Repository full history and files (.git) Working directory visible files outside .git Commit snapshot of project Index

7

Repository full history and files (.git)

Working directory visible files outside .git

Commit snapshot of project

Index staging area for next commit

Terminology

Page 7: or: how I learned to stopy worrying and love source control · 7 Repository full history and files (.git) Working directory visible files outside .git Commit snapshot of project Index

8

Remote repository

Local repository

Index

Working directory

clone

commit

add

push fetch

checkout

pull

Page 8: or: how I learned to stopy worrying and love source control · 7 Repository full history and files (.git) Working directory visible files outside .git Commit snapshot of project Index

9

Remote repository

Local repository

Index

Working directory

clone

commit

add

push fetch

checkout

pull

Page 9: or: how I learned to stopy worrying and love source control · 7 Repository full history and files (.git) Working directory visible files outside .git Commit snapshot of project Index

10

Remote repository

Local repository

Index

Working directory

clone

commit

add

push fetch

checkout

pull

Page 10: or: how I learned to stopy worrying and love source control · 7 Repository full history and files (.git) Working directory visible files outside .git Commit snapshot of project Index

11

Remote repository

Local repository

Index

Working directory

clone

commit

add

push fetch

checkout

pull

Page 11: or: how I learned to stopy worrying and love source control · 7 Repository full history and files (.git) Working directory visible files outside .git Commit snapshot of project Index

12

Remote repository

Local repository

Index

Working directory

clone

commit

add

push fetch

checkout

pull

Page 12: or: how I learned to stopy worrying and love source control · 7 Repository full history and files (.git) Working directory visible files outside .git Commit snapshot of project Index

13

Remote repository

Local repository

Index

Working directory

clone

commit

add

push fetch

checkout

pull

Page 13: or: how I learned to stopy worrying and love source control · 7 Repository full history and files (.git) Working directory visible files outside .git Commit snapshot of project Index

14

Remote repository

Local repository

Index

Working directory

clone

commit

add

push fetch

checkout

pull

Page 14: or: how I learned to stopy worrying and love source control · 7 Repository full history and files (.git) Working directory visible files outside .git Commit snapshot of project Index

15

Remote repository

Local repository

Index

Working directory

clone

commit

add

push fetch

checkout

pull

Page 15: or: how I learned to stopy worrying and love source control · 7 Repository full history and files (.git) Working directory visible files outside .git Commit snapshot of project Index

16

Remote repository

Local repository

Index

Working directory

clone

commit

add

push fetch

checkout

pull

Page 16: or: how I learned to stopy worrying and love source control · 7 Repository full history and files (.git) Working directory visible files outside .git Commit snapshot of project Index

17

Remote repository

Local repository

Index

Working directory

clone

commit

add

push fetch

checkout

pull

Page 17: or: how I learned to stopy worrying and love source control · 7 Repository full history and files (.git) Working directory visible files outside .git Commit snapshot of project Index

18

Remote repository

Local repository

Index

Working directory

clone

commit

add

push fetch

checkout

pull

Page 18: or: how I learned to stopy worrying and love source control · 7 Repository full history and files (.git) Working directory visible files outside .git Commit snapshot of project Index

19

Remote repository

Local repository

Index

Working directory

clone

commit

add

push fetch

checkout

pull

Page 19: or: how I learned to stopy worrying and love source control · 7 Repository full history and files (.git) Working directory visible files outside .git Commit snapshot of project Index

20

Remote repository

Local repository

Index

Working directory

clone

commit

add

push fetch

checkout

pull

Page 20: or: how I learned to stopy worrying and love source control · 7 Repository full history and files (.git) Working directory visible files outside .git Commit snapshot of project Index

21

Blob binary data

Tree folder entries of blobs

Commit snapshot of a tree

Tag fixed pointer to a commit

Branch pointer to a commit

Objects in Detail

Page 21: or: how I learned to stopy worrying and love source control · 7 Repository full history and files (.git) Working directory visible files outside .git Commit snapshot of project Index

22

Points to a tree and to ancestors

0 ancestors initial commit

>1 ancestors merge commit

„name“ is 40 digit SHA-1 hash

Commit

Page 22: or: how I learned to stopy worrying and love source control · 7 Repository full history and files (.git) Working directory visible files outside .git Commit snapshot of project Index

23

HEAD

master

time

Page 23: or: how I learned to stopy worrying and love source control · 7 Repository full history and files (.git) Working directory visible files outside .git Commit snapshot of project Index

24

HEAD

master

time

Page 24: or: how I learned to stopy worrying and love source control · 7 Repository full history and files (.git) Working directory visible files outside .git Commit snapshot of project Index

25

HEAD

master

time

Page 25: or: how I learned to stopy worrying and love source control · 7 Repository full history and files (.git) Working directory visible files outside .git Commit snapshot of project Index

26

HEAD

master

time

Page 26: or: how I learned to stopy worrying and love source control · 7 Repository full history and files (.git) Working directory visible files outside .git Commit snapshot of project Index

27

master

time

HEAD

fixing_javadoc

Page 27: or: how I learned to stopy worrying and love source control · 7 Repository full history and files (.git) Working directory visible files outside .git Commit snapshot of project Index

28

master

time

HEAD

fixing_javadoc

Page 28: or: how I learned to stopy worrying and love source control · 7 Repository full history and files (.git) Working directory visible files outside .git Commit snapshot of project Index

29

HEAD

master

time

fixing_javadoc

Page 29: or: how I learned to stopy worrying and love source control · 7 Repository full history and files (.git) Working directory visible files outside .git Commit snapshot of project Index

30

master

time

HEAD

fixing_javadoc

Page 30: or: how I learned to stopy worrying and love source control · 7 Repository full history and files (.git) Working directory visible files outside .git Commit snapshot of project Index

31

HEAD

master

time

fixing_javadoc

Page 31: or: how I learned to stopy worrying and love source control · 7 Repository full history and files (.git) Working directory visible files outside .git Commit snapshot of project Index

32

Long-living Branches

Feature Branches

Branching Strategies

Page 32: or: how I learned to stopy worrying and love source control · 7 Repository full history and files (.git) Working directory visible files outside .git Commit snapshot of project Index

33

Feature Branches

Source: https://www.atlassian.com/git/workflows

Page 33: or: how I learned to stopy worrying and love source control · 7 Repository full history and files (.git) Working directory visible files outside .git Commit snapshot of project Index

Github - Social Coding

34

Page 34: or: how I learned to stopy worrying and love source control · 7 Repository full history and files (.git) Working directory visible files outside .git Commit snapshot of project Index

35

Pull requests

Issues

Forks

Github

Page 35: or: how I learned to stopy worrying and love source control · 7 Repository full history and files (.git) Working directory visible files outside .git Commit snapshot of project Index

36 Pull Requests

Page 36: or: how I learned to stopy worrying and love source control · 7 Repository full history and files (.git) Working directory visible files outside .git Commit snapshot of project Index

37 Issues

Page 37: or: how I learned to stopy worrying and love source control · 7 Repository full history and files (.git) Working directory visible files outside .git Commit snapshot of project Index

38

http://www.syntevo.com/smartgithg/download

Git UI: SmartGit

Page 38: or: how I learned to stopy worrying and love source control · 7 Repository full history and files (.git) Working directory visible files outside .git Commit snapshot of project Index

39

https://help.github.com/

http://try.github.io

http://gitimmersion.com/

http://git-scm.com/book

Resources

Page 39: or: how I learned to stopy worrying and love source control · 7 Repository full history and files (.git) Working directory visible files outside .git Commit snapshot of project Index

40

http://try.github.io

https://help.github.com/articles/set-up-git

Github Hands-on


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,

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 avanzado - Mario González, formador y desarrollador web · 2019-10-01 · git fetch + git rebase = git pull --rebase Subir tags: git push --tags Git avanzado. Repositorios remotos

GIT BASICS FOR EVERYONE...Git installation Macbook: If Xcode exists, probably you already have git. Check with `git —version` `brew install git` Windows: Download windows git installer

Fedora Classroom · 2018. 8. 13. · Git repository: Fedora Council Docs Git repository: Quick Docs Git repository: Mentored Projects Git repository: Fedora Modularity Git repository:

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

Git and git flow

By: Anuj Sharma. Topics covered: GIT Introduction GIT Benefits over different tools GIT workflow GIT server creation How to use GIT for first

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

Intro to git and git hub

Git Workshop : Git On The Server

ALaboratoryIntroductionto git and GitHubnewton.cx/~peter/files/git-lab-handout.pdf · git status, git checkout 7 Topic 3: git status, git checkout Fundamentally, Now,insomecircumstancesHEAD

Smacking Git Around - Advanced Git Tricks

Git Going w/ Git

Manual Git y Git Hub

2013 GIT Marking Scheme English @ apepanthiyaapepanthiya.lk/resources/git/papers/2013 GIT... · 2013 GIT Marking Scheme English @ apepanthiya.lk Subject: G.C.E A/L GIT Marking Schemes

ORGANIZACJA OPIEKI NAD CHORYMI Z ZESPOŁEM STOPY ... · organizacja opieki nad chorymi z zespoŁem stopy cukrzycowej. wytyczne polskiego towarzystwa leczenia ran the organization

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 Best Practices - MariaDB.org...$ git push Write a good commit message! Regular git workflow $ git checkout bb-10.2-bug $ # Code, build, test... $ git add . $ git commit $ git push

new repository – clone · Initialized empty Git repository abaj ric@nb01 — Terminal git-demo . git in /home/abaj ric/git-demo.git/ Terminal abajric@nb01 -/git-demo-local S git

Git, smart git & gitflow

A brief introduction to git & GitHubkbroman/presentations/Git...git clone [email protected]:username/repo Change things locally, git add, git commit Push your changes to your GitHub repository

CS140 Project 1: Threads - Stanford University · git basics git add git commit git pull git push git merge git branch * Lots of git tutorials and help available online

Git tutorial git branches 20131206-Bryan

2012 GIT English - Ape Panthiya GIT English... · 2012 GIT English @ apepanthiya.lk Subject: G.C.E A/L GIT Past Papers Keywords: git, al git, git papers, git past papers, git exam,

> version.txt $ git add version.txt" href="https://vdocument.in/git-flow-git-flow-release-help-git-flow-release-list-git-flow-release-start.html">git-flow - jesusamieiro.com · $ git flow release help $ git flow release list $ git flow release start 0.1.0 $ git branch -a -v $ echo "0.1.0" >> version.txt $ git add version.txt

Git Tricks — git utilities that make life git easier

2013 GIT Sinhala @ apepanthiya GIT Sinhala... · 2013 GIT Sinhala @ apepanthiya.lk Subject: G.C.E A/L GIT Past Papers Keywords: git, al git, git papers, git past papers, git exam,

Worrying Facts

Git - distributed VCSds.cs.ut.ee/courses/previous/seminar-materials/git-vcs.pdf · Thoughts on git Overview Tutorial way, not my way today Thoughts on git Clarification Git architecture

2012 GIT Sinhala @ apepanthiya GIT Sinhala @ apepanthiya.lk.pdf2012 GIT Sinhala @ apepanthiya.lk Subject: G.C.E A/L GIT Past Papers Keywords: git, al git, git papers, git past papers,

YYj t Y GIT) GIT)...(k)GIT) (jJlJY) HP-K IN) Sam le Book GIT) * \YYj t Y GIT) GIT) Created Date 11/12/2018 3:39:52 PM

Git j club magnets in GIT

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

Git J Club Dm Git