Upload File

intro to gitp.3 what is git intro to git started in 2005 created by linus torvalds to aid...

  • Home
  • Documents
  • Intro to Gitp.3 What is Git Intro to Git Started in 2005 Created by Linus Torvalds to aid development of the Linux Kernel Primarily used for source code management in software development
21
Git and Gerrit For Working With and On Qt Qt World Summit 2019 Presented by Kevin Funk

Upload: others

Post on 01-Aug-2020

18 views

Category:

Documents


0 download

Report

TRANSCRIPT

Page 1: Intro to Gitp.3 What is Git Intro to Git Started in 2005 Created by Linus Torvalds to aid development of the Linux Kernel Primarily used for source code management in software development

GitandGerritForWorkingWithandOnQtQtWorldSummit2019

PresentedbyKevinFunk

Page 2: Intro to Gitp.3 What is Git Intro to Git Started in 2005 Created by Linus Torvalds to aid development of the Linux Kernel Primarily used for source code management in software development

p.2

IntrotoGit

IntrotoGit

IntrotoGit

IntrotoGerritforQt

Page 3: Intro to Gitp.3 What is Git Intro to Git Started in 2005 Created by Linus Torvalds to aid development of the Linux Kernel Primarily used for source code management in software development

p.3

WhatisGit

IntrotoGit

Startedin2005

CreatedbyLinusTorvaldstoaiddevelopmentoftheLinuxKernel

Primarilyusedforsourcecodemanagementinsoftwaredevelopment

Availableonallmajorplatforms:Linux,Windows,macOS

FreeandOpenSource

Page 4: Intro to Gitp.3 What is Git Intro to Git Started in 2005 Created by Linus Torvalds to aid development of the Linux Kernel Primarily used for source code management in software development

p.4

Keyfeatures

IntrotoGit

Instantbranchingandmerging

Smallandfast

Fullydistributed

Dataassurance/integrity

Handleshugeprojectswithease(hint:LinuxKernel)

Uniquefeature:Stagingarea

Page 5: Intro to Gitp.3 What is Git Intro to Git Started in 2005 Created by Linus Torvalds to aid development of the Linux Kernel Primarily used for source code management in software development

p.5

FromSubversiontoGit

IntrotoGit

Source:git-tower.com

Page 6: Intro to Gitp.3 What is Git Intro to Git Started in 2005 Created by Linus Torvalds to aid development of the Linux Kernel Primarily used for source code management in software development

p.6

InteractingwithGit

IntrotoGit

Mostpowerful:gitviacommand-lineButalsohasthemost-steeplearningcurve

Graphical(standalone):gitk(cross-platform;'default')GitExtensions(cross-platform;free,GPL)SourceTree(Windows,macOS;free,proprietary)manyothers!(https://git-scm.com/downloads/guis/)

Graphical(integrated):GitpluginsformostIntegratedDevelopmentEnvironments

https://git-scm.com/downloads/guis/
Page 7: Intro to Gitp.3 What is Git Intro to Git Started in 2005 Created by Linus Torvalds to aid development of the Linux Kernel Primarily used for source code management in software development

p.7

InteractingwithGit(cont'd)

IntrotoGit

Notethatinthisguidewe'llfocusoninteractionwiththecommand-lineclient

Page 8: Intro to Gitp.3 What is Git Intro to Git Started in 2005 Created by Linus Torvalds to aid development of the Linux Kernel Primarily used for source code management in software development

p.8

GettingHelp

IntrotoGit

Referencemanual:https://git-scm.com/doc

Orforamorebriefversion:mangit,ORgit--help(equivalenttoabove),ORgitCOMMAND--help

https://git-scm.com/doc
Page 9: Intro to Gitp.3 What is Git Intro to Git Started in 2005 Created by Linus Torvalds to aid development of the Linux Kernel Primarily used for source code management in software development

p.8

GettingHelp

IntrotoGit

Referencemanual:https://git-scm.com/doc

Orforamorebriefversion:mangit,ORgit--help(equivalenttoabove),ORgitCOMMAND--help

Anotherindispensablesourceforhelp:stackoverflow.com

https://git-scm.com/doc
Page 10: Intro to Gitp.3 What is Git Intro to Git Started in 2005 Created by Linus Torvalds to aid development of the Linux Kernel Primarily used for source code management in software development

p.9

FirstThingsFirst

IntrotoGit

TellGitwhoyouare:gitconfig--globaluser.name"YourName"gitconfig--globaluser.email"[email protected]"

Globalsettingsfile:~/.gitconfig

Projectsettingsfile:$PROJECTDIR/.git/config

    WindowsusersGitlooksforthe.gitconfigfileinthe%HOME%directory:C:\Users\%USER%formostpeople

Page 11: Intro to Gitp.3 What is Git Intro to Git Started in 2005 Created by Linus Torvalds to aid development of the Linux Kernel Primarily used for source code management in software development

p.10

USECASE:InitialCheck-out

IntrotoGit

Example(checkingoutfromaremotelocation):gitclonegit://code.qt.io/qt/qt5.git

Example(...andaspecificbranch):gitclonegit://code.qt.io/qt/qt5.git-b5.12

Page 12: Intro to Gitp.3 What is Git Intro to Git Started in 2005 Created by Linus Torvalds to aid development of the Linux Kernel Primarily used for source code management in software development

p.11

USECASE:Commit

IntrotoGit

Seeyourchanges:gitstatusORgitdiffORgitk

Markthefilesyouwanttocheckin:gitadd<files>

Checkinthemarkedfiles:gitcommitORgitcommit-m"checkinmessage"

Fetchlatestversionfromremoteserver:gitpull

Pushthechangestotheserver:gitpush

Youmaycommitallfilesusing-aoption:gitcommit-a

Demo

Page 13: Intro to Gitp.3 What is Git Intro to Git Started in 2005 Created by Linus Torvalds to aid development of the Linux Kernel Primarily used for source code management in software development

p.12

IntrotoGerritforQt

IntrotoGerritforQt

IntrotoGit

IntrotoGerritforQt

Page 14: Intro to Gitp.3 What is Git Intro to Git Started in 2005 Created by Linus Torvalds to aid development of the Linux Kernel Primarily used for source code management in software development

p.13

HowtouseGerritbyexampleofcontributingtoQt

IntrotoGerritforQt

Qt'sdevelopmentoccursintheopeninrepositoriesathttps://codereview.qt-project.org(aGerritcodereviewinstance).

Theyaremirroredread-onlyatcode.qt.io

TheQtprojectprovidesfreehostingtoprojectsrelatedtoQtwhichhavebeenincubatedandacceptedbythecommunity

CloningQt:gitclonegit://code.qt.io/qt/qt5.git

Seehttp://wiki.qt.io/Building_Qt_5_from_Gitforbuildinstructions

https://codereview.qt-project.org
http://wiki.qt.io/Building_Qt_5_from_Git
Page 15: Intro to Gitp.3 What is Git Intro to Git Started in 2005 Created by Linus Torvalds to aid development of the Linux Kernel Primarily used for source code management in software development

p.14

ContributingtoQtviaGerrit

IntrotoGerritforQt

PrerequisitesQtAccount(SSO)

https://login.qt.io/registerAccesstoGerrit

https://codereview.qt-project.org/AccesstoJIRA(forclosingbugs,etc.)

https://bugreports.qt.io/SignedContributorAgreement

CanbedoneinGerritMoreinfo:https://www.qt.io/legal-contribution-agreement-qt 

https://login.qt.io/register
https://codereview.qt-project.org/
https://bugreports.qt.io/
https://www.qt.io/legal-contribution-agreement-qt
Page 16: Intro to Gitp.3 What is Git Intro to Git Started in 2005 Created by Linus Torvalds to aid development of the Linux Kernel Primarily used for source code management in software development

p.15

ContributingtoQtviaGerrit(cont'd)

IntrotoGerritforQt

YoumightwanttosubmitapatchbacktoQt'srepositories.

TodothisyouneedtosignupforaGerritaccountathttps://codereview.qt-project.org/.

SetupforusingGerritonyourlocalclone.gitremoteaddgerritGERRIT_URL;...

Commitlocallyasusual.

Pushlocalcommitstogerrit.gitpushgerritHEAD:refs/for/5.9

orgitpushgerritHEAD:refs/for/dev

AremotehookfromGerritwillprintanURL.

OpentheresultingURL(s)andfollowthereviewprocedures.

https://codereview.qt-project.org/
Page 17: Intro to Gitp.3 What is Git Intro to Git Started in 2005 Created by Linus Torvalds to aid development of the Linux Kernel Primarily used for source code management in software development

p.16

GerritSetupforQtdevelopment

IntrotoGerritforQt

ConfigureSSH:1 Hostcodereview.qt-project.org2     Port294183     User

Addacommithook:scp-pcodereview.qt-project.org:hooks/commit-msg.git/hooks

Orcopyfromhttp://codereview.qt-project.org/tools/hooks/commit-msg

Addanew"remote"toyourclone:gitremoteaddgerritssh://codereview.qt-project.org/qt/qt5

Seehttp://wiki.qt.io/Setting-up-Gerrit

http://codereview.qt-project.org/tools/hooks/commit-msg
http://wiki.qt.io/Setting-up-Gerrit
Page 18: Intro to Gitp.3 What is Git Intro to Git Started in 2005 Created by Linus Torvalds to aid development of the Linux Kernel Primarily used for source code management in software development

p.17

AddingreviewerstoyourChangeRequest

IntrotoGerritforQt

Findoutwhoworkedonthesourcefile(s)youarechanginggitlog[path]gitblame[path]

Oratleastaddthemodulemaintainerhttps://wiki.qt.io/Maintainers

https://wiki.qt.io/Maintainers
Page 19: Intro to Gitp.3 What is Git Intro to Git Started in 2005 Created by Linus Torvalds to aid development of the Linux Kernel Primarily used for source code management in software development

p.18

ChangeRequest:LifeCycle

IntrotoGerritforQt

Page 20: Intro to Gitp.3 What is Git Intro to Git Started in 2005 Created by Linus Torvalds to aid development of the Linux Kernel Primarily used for source code management in software development

p.19

Resources

Entrypoint:https://www.qt.io/contribute-to-qthttps://wiki.qt.io/Setting_up_Gerrithttps://wiki.qt.io/Gerrit_Introduction

HelpersGitgpushscript:https://wiki.qt.io/Git-gpush-scripts

https://www.qt.io/contribute-to-qt
https://wiki.qt.io/Setting_up_Gerrit
https://wiki.qt.io/Gerrit_Introduction
https://wiki.qt.io/Git-gpush-scripts
Page 21: Intro to Gitp.3 What is Git Intro to Git Started in 2005 Created by Linus Torvalds to aid development of the Linux Kernel Primarily used for source code management in software development

p.20

Questions?

[email protected]

KDABisnowofferingGittrainingsandworkshops!

www.kdab.com
mailto:[email protected]

Workshop Personal Branding Gitp

A practical 30m intro to Git vcs

Our Puppet Story – Patterns and Learnings · 2.Vagrant 3.Puppet Intro Dashboard&PE Facter&Hiera git Problems Misc. 1.Intro 2.Vagrant 3.Puppet Intro Dashboard&PE Facter&Hiera git

Intro to git and git hub

GITP. People without borders

Introduction to markdown and git - Statistical Sciencercs46/lectures_2015/01-markdown-git/01-intro … · Git Git is a version control system. I It’s a tool that tracks changes

Intro to Git and Github ~ Girl Develop It ~ INTRO TO GIT ...files.meetup.com/1798823/Intro to Git and Github _ Girl Develop It.pdf · When we add a new file, we tell Git to add the

Intro git github_ppt

05 intro-git-github-heroku-v4

Git / Github intro - thirdsector.mlog.taik.fithirdsector.mlog.taik.fi/files/2013/03/github-intro-kkarhu.pdf · Git / Github intro Kimmo Karhu SCI Department of Computer Science and

Inge Telting GITP Medezeggenschap en de Benchmark

Intro to Version Control with Git and Github

Git - (Why not CVS? because Git.) - Fedorakzak.fedorapeople.org/git-presentation.pdf · GNU General Public License, version 2. Intro Basic features distributed development model

Gitp thanks tower_isles_patties

Intro to Git - QUSER | Twin Cities IBM Power Systems User ... · Intro to Git Kevin Adler ... Linus used git to manage the 2.6.12 Linux release (Jun 18, 2005) ... *Only SSH and GIT

Intro to Git and GitHub

Intro to Git

Intro to Git: a hands-on workshop

Open Innovation Lab (OIL) - 20150227 - GIT Intro Workshop

CSE 390a - Git Lecture - courses.cs.washington.educourses.cs.washington.edu/.../cse390a/13su/lectures/8/390aGitIntro... · 2 Basic Intro to Git •We will: Discuss how Git differs

Intro. to Git and Github

git-svn intro

Rails Girls Presentation - Basic Intro to Git & GitHub

Intro to Git/GitHub/GitLab · Intro to Git/GitHub/GitLab NoVaLUG - July 2019 John Kennedy. Topics What is git? Why do I need git? Git Glossary Create an empty git repo What happens

Purdue ACM SigApp Intro to Git

A quick intro to Git and GitHub - tsc.uc3m.esmiguel/MLG/adjuntos/github.pdfIntroduction Basic Git Branching in Git GitHub Hands-on practice Git I Don’t confuse Git with GitHub I

JdeRobot talks - An advanced intro to Gitwiki.jderobot.org/store/jmplaza/uploads/charlas/traspas-git-victor.pdf · Title: JdeRobot talks - An advanced intro to Git Author: Victor

Git Quick Intro

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, GitHub, and Devpost

Intro to-git-class

Git: An intro of plumbing and porcelain commands

Git - Intro to the Basics of DVCS

Basic Git Intro

Intro to Git, GitHub, and BitBucket