an introduction to git
play

an introduction to git Ewen Cheslack-Postava 1 Outline Review of - PDF document

Jun 04, 2023 •207 likes •827 views

an introduction to git Ewen Cheslack-Postava 1 Outline Review of Version Control Distributed Version Control Repository Model Working Locally Workflows Additional Resources 2 Version Control Basics Developer chooses

  1. an introduction to git Ewen Cheslack-Postava 1

  2. Outline • Review of Version Control • Distributed Version Control • Repository Model • Working Locally • Workflows • Additional Resources 2

  3. Version Control Basics • Developer chooses checkpoints • VCS provides atomic commits • And method to exchange them • Handles conflicts • Other developer committed to same file before you 3

  4. Version Control Basics VCS • Simple, linear model master 4

  5. Version Control Basics • Branching model VCS branch • Parallel development • Bug fixes vs. next release • Merges reconnect branch and master master 5

  6. Version Control Basics • Useful even for single developer! • Attach messages to commits to indicate what was done and why • Manage work on multiple features using branches • Binary search to find bug-causing commit 6

  7. Centralized VCS • Repository is centralized • Most operations interact with server • Examples: CVS, SVN • In practice: • Branching is a copy • Merging isn’t handled well • These are getting better (see newest svn) 7

  8. How does git differ? • ... or Arch? • ... or Monotone? • ... or Darcs? • ... or Hg? • ... or Bazaar? 8 So how does git di fg er from the “standard” centralized model of revision control? Actually, git isn’t particularly special -- we could ask the same of Arch, Monotone, etc. All of these are distributed revision control systems or DVCS. While they are di fg erent, they all share common core concepts.

  9. How do DVCS differ? 9

  10. How do DVCS differ? • No checkouts, only repositories 9

  11. How do DVCS differ? • No checkouts, only repositories • Avoid network except to sync 9

  12. How do DVCS differ? • No checkouts, only repositories • Avoid network except to sync • Encourage branching - cheap, local 9

  13. How do DVCS differ? • No checkouts, only repositories • Avoid network except to sync • Encourage branching - cheap, local • Better merge (usually) 9

  14. Repository Model • Graph of commits - hash of content local branch • Edges are patches P 1 P 2 • Only branches, no “trunk” • Default master branch, not P 3 special master • GC using branch HEADs and tags (a.k.a. refs) 10

  15. Local - Cloning project/ 11 The basic workflow with DVCS is both similar and di fg erent from normal VCS. Instead of checking out a current revision, you clone the entire repository. Every revision ever checked in, and all branches and tags, will be copied locally to your machine (in the .git directory). A “checkout” now is just getting a certain copy into the working directory so you can edit it, but it always comes from local files.

  16. Local - Cloning project/ • Don’t checkout , instead clone .git/ • git clone git://user@server/repo.git [dest] • Complete copy of repository 11 The basic workflow with DVCS is both similar and di fg erent from normal VCS. Instead of checking out a current revision, you clone the entire repository. Every revision ever checked in, and all branches and tags, will be copied locally to your machine (in the .git directory). A “checkout” now is just getting a certain copy into the working directory so you can edit it, but it always comes from local files.

  17. Local - Cloning project/ • Don’t checkout , instead clone .git/ • git clone git://user@server/repo.git d1/ [dest] • Complete copy of repository d2/ • Checkout gets a working version f1 • git checkout master f2 11 The basic workflow with DVCS is both similar and di fg erent from normal VCS. Instead of checking out a current revision, you clone the entire repository. Every revision ever checked in, and all branches and tags, will be copied locally to your machine (in the .git directory). A “checkout” now is just getting a certain copy into the working directory so you can edit it, but it always comes from local files.

  18. Local - Commits local HEAD 12 In git, and other DVCS, commits are local. This means that they only a fg ect your local repository. Git is a bit odd in that it requires you to add and then commit files. This gives you finer granularity when selecting what to commit. There’s even a mode where you can select parts of patches to files to add called “interactive add.” Adding files puts those changes in the “staging area.” The staging area is used in a number of commands as temporary storage before completing an operation. You can think of it like an in-progress commit. While the changes are there, they are trivial to back out, but you also won’t lose them by editing files. Finally, you can commit. I’ve specified a message on the command line, and git will always prompt you for a commit message. If you don’t put a descriptive commit message, your developer friends won’t like you.

  19. Local - Commits • Commits are local local HEAD 12 In git, and other DVCS, commits are local. This means that they only a fg ect your local repository. Git is a bit odd in that it requires you to add and then commit files. This gives you finer granularity when selecting what to commit. There’s even a mode where you can select parts of patches to files to add called “interactive add.” Adding files puts those changes in the “staging area.” The staging area is used in a number of commands as temporary storage before completing an operation. You can think of it like an in-progress commit. While the changes are there, they are trivial to back out, but you also won’t lose them by editing files. Finally, you can commit. I’ve specified a message on the command line, and git will always prompt you for a commit message. If you don’t put a descriptive commit message, your developer friends won’t like you.

  20. Local - Commits • Commits are local local • Add files or changes • git add file1 file2 HEAD • Staging area 12 In git, and other DVCS, commits are local. This means that they only a fg ect your local repository. Git is a bit odd in that it requires you to add and then commit files. This gives you finer granularity when selecting what to commit. There’s even a mode where you can select parts of patches to files to add called “interactive add.” Adding files puts those changes in the “staging area.” The staging area is used in a number of commands as temporary storage before completing an operation. You can think of it like an in-progress commit. While the changes are there, they are trivial to back out, but you also won’t lose them by editing files. Finally, you can commit. I’ve specified a message on the command line, and git will always prompt you for a commit message. If you don’t put a descriptive commit message, your developer friends won’t like you.

  21. Local - Commits • Commits are local local • Add files or changes • git add file1 file2 HEAD • Staging area Staging 12 In git, and other DVCS, commits are local. This means that they only a fg ect your local repository. Git is a bit odd in that it requires you to add and then commit files. This gives you finer granularity when selecting what to commit. There’s even a mode where you can select parts of patches to files to add called “interactive add.” Adding files puts those changes in the “staging area.” The staging area is used in a number of commands as temporary storage before completing an operation. You can think of it like an in-progress commit. While the changes are there, they are trivial to back out, but you also won’t lose them by editing files. Finally, you can commit. I’ve specified a message on the command line, and git will always prompt you for a commit message. If you don’t put a descriptive commit message, your developer friends won’t like you.

  22. Local - Commits • Commits are local local • Add files or changes • git add file1 file2 HEAD • Staging area Staging • Commit • git commit -m “Useful commit message.” 12 In git, and other DVCS, commits are local. This means that they only a fg ect your local repository. Git is a bit odd in that it requires you to add and then commit files. This gives you finer granularity when selecting what to commit. There’s even a mode where you can select parts of patches to files to add called “interactive add.” Adding files puts those changes in the “staging area.” The staging area is used in a number of commands as temporary storage before completing an operation. You can think of it like an in-progress commit. While the changes are there, they are trivial to back out, but you also won’t lose them by editing files. Finally, you can commit. I’ve specified a message on the command line, and git will always prompt you for a commit message. If you don’t put a descriptive commit message, your developer friends won’t like you.

Recommend

INTRODUCTION INTRODUCTION INTRODUCTION INTRODUCTION INTRODUCTION INTRODUCTION INTRODUCTION

INTRODUCTION INTRODUCTION INTRODUCTION INTRODUCTION INTRODUCTION INTRODUCTION INTRODUCTION

TRAINING COURSE ON SOCIAL PROTECTION & FORMALIZATION TRINIDAD AND TOBAGO MARCH 15, 2017 INTRODUCTION INTRODUCTION INTRODUCTION INTRODUCTION INTRODUCTION INTRODUCTION INTRODUCTION INTRODUCTION Design of the NIS Assistance from the

547 views • 23 slides
INTRODUCTION Introduction 2/42 INTRODUCTION Alternations I am giving bread to the

INTRODUCTION Introduction 2/42 INTRODUCTION Alternations I am giving bread to the

Patterns of variation in the expression of case and agreement Andrs Brny Leiden University Centre for Linguistics 9 November 2019, BaSIS Workshop a.barany@hum.leidenuniv.nl INTRODUCTION Introduction 2/42 INTRODUCTION

1.37k views • 42 slides
Introduction Introduction Introduction Introduction Outline Motivation Failures

Introduction Introduction Introduction Introduction Outline Motivation Failures

Introduction Introduction Introduction Introduction Outline Motivation Failures Definition and concepts Process and product properties Principles SE Approaches Motivation Software and the economy The economies of

1.03k views • 49 slides
Introduction Introduction Introduction Nationwide Cause for Concern 1

Introduction Introduction Introduction Nationwide Cause for Concern 1

Introduction Introduction Introduction Nationwide Cause for Concern 1 https://www.cdc.gov/std/stats17/infographic.htm Introduction Epidemiology in Western Colorado CPHE Surveillance Data Report, May 2018 Chlamydia Epidemiology in Western

977 views • 39 slides
DAQ introduction Purpose of this talk : (1) Introduction for those who have not been in every

DAQ introduction Purpose of this talk : (1) Introduction for those who have not been in every

DAQ introduction Purpose of this talk : (1) Introduction for those who have not been in every meeting (2) Some ideas of diagrams for section 7.1 (Introduction) of TP. Giles Barr 25 Jan 2018, Pembroke College On DUNE, the reality is there is a

474 views • 10 slides
INTRODUCTION cf. Schneider, Chapter 1 INTRODUCTION THEY ARE OUT TO GET YOU INTRODUCTION WHAT

INTRODUCTION cf. Schneider, Chapter 1 INTRODUCTION THEY ARE OUT TO GET YOU INTRODUCTION WHAT

ADVANCED COMPUTER SECURITY INTRODUCTION cf. Schneider, Chapter 1 INTRODUCTION THEY ARE OUT TO GET YOU INTRODUCTION WHAT IS SECURITY? A systems security policies describe What the system is supposed to do Store and provide access

479 views • 16 slides
Overview Introduction to SMIL Introduction to W3C and XML Introduction to SMIL

Overview Introduction to SMIL Introduction to W3C and XML Introduction to SMIL

Overview Introduction to SMIL Introduction to W3C and XML Introduction to SMIL Writing a SMIL file Adding Media Objects Martin Halvey Clipping media files January 2008 Timing and Synchronising Layout World Wide

387 views • 14 slides
14 Introduction Introduction Bad guys can put malware into Example: hosts

14 Introduction Introduction Bad guys can put malware into Example: hosts

Introduction Introduction source Encapsulation ISO/OSI reference model message M application segment H t H t M transport network datagram H n H n H t M presentation: allow applications to frame link H l H n H t M interpret

583 views • 4 slides
Previous Lecture Introduction to SMIL 2 Introduction to W3C and XML Introduction to SMIL

Previous Lecture Introduction to SMIL 2 Introduction to W3C and XML Introduction to SMIL

Previous Lecture Introduction to SMIL 2 Introduction to W3C and XML Introduction to SMIL Writing a SMIL file Adding Media Objects Martin Halvey Clipping media files January 2008 Timing and Synchronising Layout

322 views • 8 slides
Lecture 1 Andreas Habegger Introduction Zynq Introduction Zynq Introduction Zynq PS vs. PL

Lecture 1 Andreas Habegger Introduction Zynq Introduction Zynq Introduction Zynq PS vs. PL

Introduction Zynq Lecture 1 Andreas Habegger Introduction Zynq Introduction Zynq Introduction Zynq PS vs. PL Processing System Processor Peripherals Data Buses AXI Bus Conclusion BTE5380 - Embedded Systems Octobre 2014 Andreas Habegger

1.81k views • 30 slides
2018.06 01 SMILE5 Introduction S E 5 02 Alpha Cloud M I L 03 Company Introduction 04

2018.06 01 SMILE5 Introduction S E 5 02 Alpha Cloud M I L 03 Company Introduction 04

2018.06 01 SMILE5 Introduction S E 5 02 Alpha Cloud M I L 03 Company Introduction 04 Project References S E 5 PART.1 SMILE5 Introduction M I L Introduction STORION-SMILE5 Residential Energy Storage System Inverter 5kW Output Input

1.06k views • 25 slides
Introduction to CICS Course introduction Course introduction What is CICS? What is an

Introduction to CICS Course introduction Course introduction What is CICS? What is an

Introduction to CICS Course introduction Course introduction What is CICS? What is an application server? Why use an application server? Course introduction Services provided by CICS How CICS applications are defined Scaling CICS to meet

1.84k views • 146 slides
Network Visualization Introduction Presented by Shahed Introduction Introduction Basic

Network Visualization Introduction Presented by Shahed Introduction Introduction Basic

Network Visualization Introduction Presented by Shahed Introduction Introduction Basic building blocks Node Links (relationship between nodes) Spatial information Network data

584 views • 9 slides
Introduction Introduction (1) Main argument of the paper: universities are not only

Introduction Introduction (1) Main argument of the paper: universities are not only

Le jugement des pairs comme outil de management des universits Peer-review as a management tool Christine Musselin (CSO, Sciences Po et CNRS) Avril 2013, Lirrsistible ascension du capitalisme acadmique Introduction Introduction (1)

590 views • 28 slides
Introduction Introduction to storage and to storage and filesystems filesystems Introduction

Introduction Introduction to storage and to storage and filesystems filesystems Introduction

Moreno Baricevic Gilberto Daz Axel Kohlmeyer Stefano Cozzini ULA ICTP CNR-IOM DEMOCRITOS Merida, VENEZUELA Trieste, ITALY Trieste, ITALY Introduction Introduction to storage and to storage and filesystems filesystems Introduction

1.19k views • 51 slides
JABLOTRON JA-100 introduction November 2011 Introduction Todays goals First introduction of

JABLOTRON JA-100 introduction November 2011 Introduction Todays goals First introduction of

JABLOTRON JA-100 introduction November 2011 Introduction Todays goals First introduction of the brand new JA-100 alarm system Visions Basic architecture System components Setting Help us with final validations You are the FIRST ones

1.69k views • 111 slides
1 Introduction Introduction Communication System Baseband an adjective that describes

1 Introduction Introduction Communication System Baseband an adjective that describes

Introduction Introduction Physical Layer Mobile network Global ISP Provides the means to transmit bits Basic Concepts of from sender to receiver, Data Transmission Defines the mechanical, electrical, and Home network timing

463 views • 7 slides
Welcome! Todays Agenda: Topic Introduction Course Introduction Team Practical

Welcome! Todays Agenda: Topic Introduction Course Introduction Team Practical

INFOGR Computer Graphics Jacco Bikker - April-July 2015 - Lecture 1: Introduction Welcome! Todays Agenda: Topic Introduction Course Introduction Team Practical Details Assignments Field Study State of

869 views • 62 slides
Introduction (00) RNDr. Martin Madaras, PhD. madaras@skeletex.xyz Introduction Introduction

Introduction (00) RNDr. Martin Madaras, PhD. madaras@skeletex.xyz Introduction Introduction

Virtual and Augmented Reality Introduction (00) RNDr. Martin Madaras, PhD. madaras@skeletex.xyz Introduction Introduction Who am I? What do I do here? 2 About me Short research bio: - 2014 - finished PhD at FMFI UK - 2014 2016 -

1.3k views • 39 slides
PRESENTATION The Introduction What is the Introduction ? The introduction prepares the audience

PRESENTATION The Introduction What is the Introduction ? The introduction prepares the audience

PRESENTATION The Introduction What is the Introduction ? The introduction prepares the audience for your presentation. It tells them what your presentation is about, why it is important, and finally, what to listen for in your speech. Get the

505 views • 3 slides
How to make a presentation with L A T EX? Introduction to L A T EX Introduction to Beamer

How to make a presentation with L A T EX? Introduction to L A T EX Introduction to Beamer

Introduction to Beamer Hafida Benhidour How to make a presentation with L A T EX? Introduction to L A T EX Introduction to Beamer Introduction to Beamer Hafida Benhidour Department of computer science King Saud University November

732 views • 49 slides
Shenzhen Cuilu jewelry Co., Ltd was founded in 1996 and its a large private enterprise

Shenzhen Cuilu jewelry Co., Ltd was founded in 1996 and its a large private enterprise

Introduction Introduction - - Brief Brief Introduction Introduction of of Cuilu Cuilu Group Group Introduction Introduction - - Brief Brief Introduction Introduction of of Cuilu Cuilu Group Group Shenzhen Cuilu jewelry Co., Ltd

147 views • 14 slides
Introduction to ICS- -214 214 Introduction to ICS Official Unit / Incident Log - A V-C-N.org

Introduction to ICS- -214 214 Introduction to ICS Official Unit / Incident Log - A V-C-N.org

V olunteer C ommunications N etwork (V-C-N.org) Introduction to ICS- -214 214 Introduction to ICS Official Unit / Incident Log - A V-C-N.org Academy Course - 2012-02.24-2208 262: Introduction to ICS-214 : V-C-N.org : Slide: 1 V olunteer C

735 views • 34 slides
Introduction to ICS- -214 214 Introduction to ICS Official Unit / Incident Log - A V-C-N.org

Introduction to ICS- -214 214 Introduction to ICS Official Unit / Incident Log - A V-C-N.org

V olunteer C ommunications N etwork (V-C-N.org) Introduction to ICS- -214 214 Introduction to ICS Official Unit / Incident Log - A V-C-N.org Academy Course - 2012-02.24-2208 262: Introduction to ICS-214 : V-C-N.org : Slide: 1 V olunteer C

558 views • 18 slides

More recommend