Git basics

17
git

description

Basic ideas behind git

Transcript of Git basics

Page 1: Git basics

git

Page 2: Git basics

История директории локально

Снэпшот — commit

Процесс создания снэпшота — тоже commit

Page 3: Git basics

commit

add → commit

ignore

Page 4: Git basics

Immutable history — DAG

Ничего не теряется!

Page 5: Git basics

Blob & sha1

Page 6: Git basics

Branch Branch pointer

checkoutcommitHEAD

master

fix-bug-1234

feature1

Page 7: Git basics

github.com

Social coding

Fork me!

Pull request — модель авторизации наоборот

Page 8: Git basics

remotes

master

remote/origin/master

master

cloneremote add

Page 9: Git basics

fetch

master

remote/origin/master

master

Page 10: Git basics

merge

remote/origin/master

master

master

Page 11: Git basics

merge conflicts

the number of planets are

<<<<<<< HEAD

nine

=======

eight

>>>>>>> branch-a

Page 12: Git basics

merge conflicts

Page 13: Git basics

rebase — альтернатива merge

1

master

remote/origin/master

master

1’

2

2’

diff1

diff2

diff1 diff2

Page 14: Git basics

pull = fetch + mergepull --rebase = fetch + rebase

Page 15: Git basics

push

1

master

remote/origin/master

master

1’

2

2’

1’ 2’

Page 16: Git basics

push conflict

1

master

remote/origin/master

master

1’

2

2’

Page 17: Git basics

Домашнее задание

https://www.codeschool.com/courses/try-git

http://pcottle.github.io/learnGitBranching/

https://www.codeschool.com/courses/try-git
http://pcottle.github.io/learnGitBranching/

Chapter - 2 What is “GIT” VERSION CONTROL AND GIT BASICS.

Chapter - 2 What is “GIT” VERSION CONTROL AND GIT BASICS.

Git basics, Team Workflows (Ciro Miranda)

Git basics, Team Workflows (Ciro Miranda)

Git basics

Git basics

Git the basics - Excessedgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf · Git the basics Ba rt T rojano wski, ba rt@jukie.net Concepts SCM comp onents SCM op erations Decentralization

Git the basics - Excessedgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf · Git the basics Ba rt T rojano wski, ba [email protected] Concepts SCM comp onents SCM op erations Decentralization

Git Basics - Georgia Institute of Technology · Git Basics Christopher Simpkins chris.simpkins@gatech.edu Chris Simpkins (Georgia Tech) CS 2340 Objects and Design CS 1331 1 / 22

Git Basics - Georgia Institute of Technology · Git Basics Christopher Simpkins [email protected] Chris Simpkins (Georgia Tech) CS 2340 Objects and Design CS 1331 1 / 22

Mastering Git Basics - erlang-factory.com · Mastering Git Basics by Tom Preston-Werner Presentation ... (C5) is created Presentation

Mastering Git Basics - erlang-factory.com · Mastering Git Basics by Tom Preston-Werner Presentation ... (C5) is created Presentation

Basics of Git and Version Control

Basics of Git and Version Control

The Basics of Git and GitHub

The Basics of Git and GitHub

2007-02-03 · Git Basics 2 - Version 1 and 2 14 git add. Git Basics 3 - Multiple Versions 15 HEAD git commit. Git Basics 4 - Multiple Branches 16 amanda-cool-feature master fix-patricks-bug

2007-02-03 · Git Basics 2 - Version 1 and 2 14 git add. Git Basics 3 - Multiple Versions 15 HEAD git commit. Git Basics 4 - Multiple Branches 16 amanda-cool-feature master fix-patricks-bug

COMMON Europe Workshop: Orion, Git, and Python! - …schd.ws/hosted_files/commoneuropecongress2017/57/GitOrion.pdf · COMMON Europe Workshop: Orion, Git, and Python! Jesse ... //git-scm.com/book/en/v2/Getting-Started-Git-Basics

COMMON Europe Workshop: Orion, Git, and Python! - …schd.ws/hosted_files/commoneuropecongress2017/57/GitOrion.pdf · COMMON Europe Workshop: Orion, Git, and Python! Jesse ... //git-scm.com/book/en/v2/Getting-Started-Git-Basics

Brainly git basics workshop

Brainly git basics workshop

Constellations on i: Orion, Git, and RPG - Schedschd.ws/hosted_files/commons17/f8/GitORion.pdf · Constellations on i: Orion, Git, and RPG ... //git-scm.com/book/en/v2/Getting-Started-Git-Basics

Constellations on i: Orion, Git, and RPG - Schedschd.ws/hosted_files/commons17/f8/GitORion.pdf · Constellations on i: Orion, Git, and RPG ... //git-scm.com/book/en/v2/Getting-Started-Git-Basics

Git basics with notes

Git basics with notes

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:

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 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

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

Git workflows (Basics)

Git workflows (Basics)

Some Git Basics - Programming 2 · Some Git Basics A few useful details including how to use .gitignore. Applied Software Project Management. Git is a Version Control System A VCS

Some Git Basics - Programming 2 · Some Git Basics A few useful details including how to use .gitignore. Applied Software Project Management. Git is a Version Control System A VCS

Git Basics: Climbing the Totem Pole

Git Basics: Climbing the Totem Pole

RMG Study Group Basics of Git Nathan Yee 2/23/2015 1.

RMG Study Group Basics of Git Nathan Yee 2/23/2015 1.

Introduction to Git Basics

Introduction to Git Basics