Git tak po prostu (SFI version)

Konrad „Ktoso“ Malawski – konrad.malawski@java.pl - @ktosopl – blog.project13.pl - SFI 2011 - 11.03.2011

Tak.Po prostu.

@ktosopl github.com/ktoso

blog.project13.pl

Masz pytanie?Nie czekaj do końca prezentacji!

Poproszę...„Pytanie do publiczności“

Ważne słowa (-: WAŻNE :-)

System kontroli wersjiScentralizowany czy Zdecentralizowany

(CVCS vs DVCS)

ZespółWspółpraca

ZmianyDiff („różnice“)

Integracja zmian

Słowniczek:Commit

SnapshotKonfliktBranch

git-ninijitsu

Config

InitClone

Add / StageResetStatusCommit

LogGitk

Git gui

RebaseAdd --patch

GrepBisectBlame

Format-patch

FetchPull

Daemon

BranchCheckoutMerge

Centralized SCM World

Jedno jedyne repozytorium„One to Rule Them All“

Svn UDAJE branche i tagi

/tags/.../branches/.../trunk/...

Helo (Git) World!

Bardzo skomplikowany setup ;-)

Git init .

(Przyjrzymy się strukturze plików git za moment „na żywo“)

SCM Wars: Attack of the clones

Git clone file:///home/ktoso/coding/intellij

Git clone ssh://ktoso@dynames/repository

Git clone http://git.project13.pl/pub/repository

Git clone https://git.project13.pl/pub/repository

Git clone git://git.project13.pl/git/repository.git

./git/index AKA „Staging Area“

indeks ponieważ istnieje plik .git/indexstaging area ponieważ idealnie obrazuje jego działanie

Commit jest LOKALNY

Commit thyself, Lancelot!

Local (internal details) workflow

ALL Git Objects on 1 slide!

Nie ma treści = nie ma nic.

BRANCH + MERGE

Przykład„Real Life“

So many heads...?

There's just one .git/HEAD$ Git branch* fire snake

master

There's just one .git/HEAD

Git checkout fire

There's just one .git/HEAD$ Git branch master* snakefire

Nowy branch = trywialne

Git branch niebieski

Nowy branch = trywialne

Git branch niebieski

Git checkout niebieski

Nowy branch, trywialniej

Git checkout -b niebieski

Git merge zielony

Fast Forward merge strategy

Git merge zielony --no-ff

Git branch -d zielony

Git branch -d

OCTOPUS

OCTOPUS (Merge Engine)

Git checkout masterGit merge feature-45 fix

Shall I push or shall I pull..?

Introducing: the buttler (server)

Git serve

git daemon \--reuseaddr \--verbose \--base-path=. \--export-all \./.git

Git config alias.serve „...“

Git serve

Git clone git://buttler/repo.git

Git serve

The good old way - Patches

Typical Open Source

git rebase

Git rebase --interactive HEAD^^

Rebase = „Zmiana bazy“

Rebase = Rewind + Replay

hs4f7z569sp

Git cherry-pick hs4f7z

hs4f7z569sp

Git tag release-1.0

Git tag release-1.0 =

svn copy http://svn.example.com/repos/calc/trunk \ http://svn.example.com/repos/calc/tags/release-1.0 \ -m "Tagging the 1.0 release of the 'calc' project."

Git svn ...

Poznaliśmy również podstawy:

Bazaar

Final bunch of links:Best Resources:● Git-scm.com● Git.wiki.kernel.org● Progit.org (Creative Commons Book)● Gitref.org● ...blogs!

Public OpenSource (or $$$ private) hosting:● Github.com● Sourceforge.net● Assembla.com● Gitorious.org● Gitenterprise.com

Private Hosting:● Google -> gitosis● Google -> gitolite

Other:● Google -> git refcard● Google -> successful git workflow

ありがとうありがとう(DZIĘKUJĘ)(DZIĘKUJĘ)

ZA UWAGĘ!ZA UWAGĘ!

Pytanie Bonusowe...

git init .touch memkdir foldergit stage .git commit -am 'Initial commit' tree .git/objects/fortune > anything.txtgit add .git commit -am \'How many git objects exist now ?'

Git tak po prostu (SFI version)

Technology

XGR Howard SFI

PSC Johnson SFI

Sfi Detail Code

Po prostu PowerPoint 2007 PL

STARFLEET MACO - SFI

ECA- program SFI

SFI-Photogrammetry, NMHU

HOW TO CERTIFY - SFI Program · new certificate with SFI. STEP 3 - USE THE SFI LABEL: SFI will provide you with the necessary artwork to use the SFI promotional and on-product labels

Overview secure firmware install (SFI) - Application note · STM32 secure firmware install (SFI) AN4992 8/37 AN4992 Rev 7 2.1.1 SFI and internal Flash memory Figure 1. SFI process

1 SFI Confidential SFI Strategy 2009 - 2013. 2 SFI Confidential 1. Human Capital 2. Quality Output 3. Global Reputation 4. Knowledge Transfer SFI Strategy

SFI Expt A

SFI-AFC 2017 Program - Alpha Visa · 7-9 November 2017 Centre des Congrs - Reims, France Program & Posters SFI-AFC 2017 Program SFI/AFC SFI AFC WEDNESDAY 8 NOVEMBER Plenary Sessions

OCC Sigerson SFI

XGR Christensen SFI

OCC Festersen SFI

XGR Adams SFI

XGR Heidemann SFI

SFI for NCFA - North Carolina Forestry Association€¦ · GUIDANCE TO SFI 2015‐2019 STANDARDS AND RULES SFI POLICIES SFI ... regulations in the country of harvest”. ... SFI for

Sfi Case Study

NE Heineman SFI