Page 1 TBD 12/08/2014 Formation GIT Laurent Kappel Groupe SII 65, rue de Bercy - 75012 Paris Tél :...

www.groupe-sii.com

12/08/2014

FormationGIT

Laurent Kappel

Groupe SII 65, rue de Bercy - 75012 ParisTél : 01 42 84 82 22 - Fax : 01 42 84 30 82

Sommaire

12/08/2014

Git is Fast

GIT is DistributedGIT is SCM

Git is ReliableUsing Git

Git is AgileGit Re-Writing History

Git Workflow

GIT is SCM

« branch »

« merge »

Panorama des SCM

A little about history …

Git is not an evolution

Who is using Git

GIT is Distributed

DistributedFast

Reliable

Centralized SCM

Single Pointof Failure

Network(slow)

AccessRights?

Git is Distributed

No a priori structure

But Git ≠ Anarchy

Git is Distributed

A very common practice:Sharing via user-owned repos

READONLY

Git is Distributed

A very common practice:Sharing via user-owned repos

Git Hosting: https://git.wiki.kernel.org/index.php/GitHosting:

Git is Distributed

Hosted

Distributed Workflow Example

Integration-Manager

Dictator & Lieutenants

Other developersonly READ

Only Danmay WRITE

NewRelease

develop, commit

ShareFeatures

IntegrateFeatures

Integration-Manager

Dictator & Lieutenants

GIT Avantages

DistributedFast

Reliable

GIT is Fast

100% local

GIT is Fast

Git Object Database

$ git cat-file -p 8e8eb67tree 91dc8d579f123918f3ac43af1e9377a97128763bauthor Laurent Kappel <lkappel@free.fr> 1407751282 +0200committer Laurent Kappel <lkappel@free.fr> 1407751282 +0200

Mon premier commit

Git Object Database

$ git tag -a v2.0 -m 'my version 2.0'$ cat .git/refs/tags/v2.0

Git Object Database

This makes Git Fast

• Restore an arbitrary version– Git: checkout a hash = O(1)– SVN: diffs between n last commits = O(n)

• Compare 2 revisions• Reset• Search through history• And many more…

Some Benchmarking

http://git-scm.com/about/small-and-fast

Git is Reliable

DistributedFast

Reliable

Git is Reliable

1. Because it’s Distributed Single dev with a remote? => 2 copies (local, remote) .git/ has it all

2. Checksums (SHA-1) for all objects Git uses Detects data corruption Guarantees Authenticity

Using Git

$ git clone https://github.com/tpaskap/gitdoc.gitCloning into ‘gitdoc'...remote: Counting objects: 67870, done.remote: Compressing objects: 100% (13454/13454), done.remote: Total 67870 (delta 49179), reused 67358 (delta 48872)Receiving objects: 100% (67870/67870), 51.40 MiB | 5.15 MiB/s, done.Resolving deltas: 100% (49179/49179), done.

$ cd gitdoc$ ls –a

... ppt .git .gitignore LICENSE README

Local Repo Working Directory

Using Git

$ git remote –vorigin https://github.com/tpaskap/GITDOC.git (fetch)origin https://github.comt/paskap/GITDOC.git (push)

$ git branch* master

$ git branch -a* master remotes/origin/HEAD -> origin/master remotes/origin/master

$ git log -n 3 --oneline424a7b2 Merge pull request #202 from g-oikonomou/cc2538-minor-fixes704309c Change the InfoPage Location of the IEEE address8b5b2bd CC2538 Documentation typo and grammar fixes

Using Git

Modificationof tracked contentModificationof tracked content

New, untracked contentNew, untracked content

Using Git

Content of thenext commit

Using Git

Merges are done LOCALLY!

“Git push failed, To prevent fromlosing history, non-fast forward

updates were rejected”

Not an error, but common-sense Files are rarely decorrelated

Using Git

Still not permittedGit is happyBut how can PROJECT authors trust you?

Using Git

$ git remote add cetic git@github.com:login/GITDOC.git

Using Git

$ git remote add cetic git@github.com:lkappel/GITDOC.git

git push cetic master

alias du remote

nom utilisateur

Using Git

$ git remote add cetic git@github.com:lkappel/GITDOC.git

$ git push cetic master

OK New repo = 2 commands !

Remote Repo$ git push [remote] [branch]$ git push [remote] [branch[:alias]]

alias remote branch

Using Git

Jan Krüger’s Cheat Sheethttp://jan-krueger.net/git

Using Git

Git LOVES branches, and so should you

Git is Agile

Re-Writing History

git rebase –i 8b5b2bd

Re-Writing History

Cherry-Picking

Others commands

Workflow

– How to structure a repository• Branches and their interactions• How the project moves forward

– Organizing people• Who accesses what• How are contributions merged? Where? By who?• Responsibilities

Working together with Git « Workflow » ?

GitFlow

http://nvie.com/posts/a-successful-git-branching-model/

GitFlow

https://github.com/nvie/gitflow

Workflow

– How to structure a repository• Branches and their interactions• How the project moves forward

– Organizing people• Who accesses what• How are contributions merged? Where? By who?• Responsibilities

Working together with Git « Workflow » ?

Integration Manager Workflow

Dictator & Lieutenants Workflow

Getting Started with Git

• Book: Pro Git. http://www.git-scm.com

• Selected Tutorials:– Git Immersion http://gitimmersion.com/

– Learn Git Branching workflow : http://nvie.com/posts/a-successful-git-branching-model/interactive : http://pcottle.github.io/learnGitBranching/

• More material:– https://training.github.com/

The End

Questions ?

Thanks !

Page 1 TBD 12/08/2014 Formation GIT Laurent Kappel Groupe SII 65, rue de Bercy - 75012 Paris Tél :...

Documents

Transcript of Page 1 TBD 12/08/2014 Formation GIT Laurent Kappel Groupe SII 65, rue de Bercy - 75012 Paris Tél :...

Respiratory Protection 29 CFR 1910.134, 29 CFR 1926.103, 30 CFR Part 11, and 42 CFR Part 84.

Converting Colors - RGB(40, 42, 84) · These gradients show how the RGB color 40, 42, 84 changes by changing the brightness by 10 percent. The ﬁrst ﬁgure shows a shift by +10%

2016 WORLD TOURNAMENT - horseshoepitching.com€¦ · 13 Dan Watson 42/11 90 98 91.8 13 Brian Simmons 40/23 52 66 78.7 14 Gary Bearpaw 42/33 68 84 80.9 14 Alan Francis 33/42 65 84

AP-42 Section Number: 2€¦ · AP-42 Section Number: 2.2 Reference Number: 1 Title: Second Review of Standards Of Performance For Sewage Sludge Incinerators EPA-450/3-84-0 10 US

Meeting with financial analysts (SFAF)...Meeting with financial analysts (SFAF) Fiscal 2013-2014 financial statements SII Group 65 Rue de Bercy - 75012 Paris Tel: 01 42 84 82 22 -

US CATALOG ProLine Panelboard and breakers · Catalog number guide 1 Product PL ProLine 2 Phases 3 Three-phase 3 Circuits 12 12 Circuits 24 24 Circuits 42 42 Circuits 84 84 Circuits1

Respirator Regulations NIOSH 42 CFR Part 84 OSHA 29 CFR 1910.134.

TYPE-CERTIFICATE DATA SHEET E...RB211 Trent 970-84, 970B-84, 972-84, 972B-84, 972E-84, 977-84, 977B-84, 980-84. These models are approved for use on multi-engined civil aircraft classified

Course Syllabus 1 year€¦ · Basic introduction in Phonetics and Hieroglyphics. Chinese in use. Phonetic, reading, vocabulary and grammar skills development. 84 - 42 42 Modular

HALL 13 HALL 14 HALL 15 Last update 29.12 - nicoll.ru · 144 42 137 149 150 84 63 72 28.5 6 10.5 24 16.5 108 9 19,5 18 108 108 42 12 44.5 42 80 18 36 84 80 120 60 21 21 35 38.5 70

VERSION CAVIARDEE - italaw...VERSION CAVIARDEE-----Simone Bardot, Sténotypiste de conférences – 20, boulevard de la Bastille – 75012 Paris Tél. 01.42.40.52.38

EAO – Your Expert Partner for Human Machine Interfaces · Anodised aluminium 84-7211.800 84-7215.800 84-7201.800 84-7205.800 84-7202.800 84-7202.800A 84-7205.800A 84-7202.800A Grey

CS42528 Data Sheet 5 CS42528 Figure 42. Quad-Speed Mode Stopband Rejection 84 Figure 43. Quad-Speed Mode Transition Band 84 Figure 44. Quad-Speed Mode Transition ...

Series 84 22.5 mm IP67 42 V 100 mA E-stop: IP65 3 A 250 VAC · 118 Series 84 22.5 mm IP67 42 V 100 mA E-stop: IP65 3 A 250 VAC Choose one component from each of the coloured sections

TI 84/84+Guidebook

Score CONCERTO FOR ORCHESTRA V. Finale÷ &? &? # ## ## ## ## ## ## ## ## ## ## ## # # 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 Piccolo

Note Bilan Exp Régulation SIAO UP - samusocial.paris · groupement d’intérêt public 1 35 avenue Courteline 75012 Paris – t. 01 41 74 84 84 – f. 01 41 74 84 81 – www. samusocial-75.fr

COVID-19 Response Update · 2020. 6. 24. · Transportation Models – 84 Seat Bus 45% (38) – Limited SD - high back seats provide partition – 42 of 84 seats –50%. one student

Pt. 84 42 CFR Ch. I (10–1–97 Edition) - ARES Ok · 528 Pt. 84 42 CFR Ch. I (10–1–97 Edition) 84.160Man tests for gases and vapors; Type A and Type AE respirators; test require-ments.

Combined Cycle Power Plants 42 and 84 MW