Retour vers le futur avec git

View Github Repository Open presentation in a new window

hrambelo

See all presentation from hrambelo

Retour vers le futur avec git

0 0

breizhCamp2015-slides

Slides and resources during breizhcamp 2015 track "Retour vers le (passé|futur) avec Git")"

On Github hrambelo / breizhCamp2015-slides

Retour vers le futur avec git

@hrambelo - #githappens

Retour vers le (passé | futur)* avec git

@hrambelo - #githappens

Disclaimer

  • Porcelain
  • Reset
  • Bisect
  • Rebase
  • Stash
  • Plumbing
  • Credits >>

Agenda

  • Porcelain
  • Reset
  • Bisect
  • Rebase
  • Stash
  • Plumbing

Background

  • v 2.4.x

Background

  • v 2.4.x
  • what's in git stay in git locally

Background

  • v 2.4.x
  • what's in git stay in git locally
  • easy branching
  • multiple branching workflow

Background

  • v 2.4.x
  • what's in git stay in git locally
  • easy branching
  • multiple branching workflow
  • SHA-1

Reset

Bisect

Bisect

Bisect

  • Reset
  • Test
  • (Reset, Test)+

Demo

Bisect

  • Fine grained CI feedback (unstable build)
  • Immediate test ROI
  • Reduce time to find bug
  • More tests = more quality

Disclaimer

Rebase

Rebase

  • Two-headed snake
  • Apply new changes
  • Grosso Modo : Ctrl-x + Ctrl-v + Ctrl-v

Rebase

Rebase

Rebase

Rebase

Rebase

  • Pick
  • Reword
  • Edit
  • Squash
  • Fixup

-i

Rebase

  • Pick

-i

Rebase

  • Pick
  • Reword

-i

Rebase

  • Pick
  • Reword
  • Edit

-i

Rebase

  • Pick
  • Reword
  • Edit

-i

Rebase

  • Pick
  • Reword
  • Edit
  • Squash

-i

Rebase

  • Pick
  • Reword
  • Edit
  • Squash
  • Fixup

-i

Démo

Wrap-up

  • Reset : pointer change
  • Bisect : inception
  • Rebase : story rewrite

Resources

Merci

Credits >> @hrambelo - #githappens

Credits

Title - https://unsplash.com/jfeliseDisclaimer - A Dead End In OgdenBackground - git merge 2015 / Linus Torvald10Years of Git / Paris, Las Vegashttps://unsplash.com/stalebg / FingerprintReset - https://unsplash.com/sonjalangfordleaking abstraction / Joël SpolskyBisect - Pont bir-hakemfun toilet plungers at annie's blue ribbon general storedarth vader / mind blowDisclaimer2 - https://unsplash.com/ahmadreza_sajadiRebase - https://unsplash.com/ohhhchelseaDoctor Emmett BrownWrap-up - https://unsplash.com/rulasibaiResources - https://unsplash.com/sylwiabartyzelThanks -https://unsplash.com/loudge

BreizhCamp 2015

#BzhCmp

Retour vers le futur avec git @hrambelo - #githappens