Tweet
Tweet

Slide 1

Slide 1 text

git, graphically Aidan Feldman

Slide 2

Slide 2 text

time normal history

Slide 3

Slide 3 text

branching master

Slide 4

Slide 4 text

branching master feature

Slide 5

Slide 5 text

branching master feature

Slide 6

Slide 6 text

branching master feature

Slide 7

Slide 7 text

branching master feature bugfix git checkout master git merge bugfix

Slide 8

Slide 8 text

branching master feature bugfix git merge feature

Slide 9

Slide 9 text

branching master feature bugfix

Slide 10

Slide 10 text

amending master git commit —amend

Slide 11

Slide 11 text

amending master

Slide 12

Slide 12 text

rebasing master feature

Slide 13

Slide 13 text

rebasing master feature git checkout feature git rebase master

Slide 14

Slide 14 text

rebasing master feature

Slide 15

Slide 15 text

squashing master feature

Slide 16

Slide 16 text

squashing master feature git checkout feature git rebase -i master

Slide 17

Slide 17 text

No content

Slide 18

Slide 18 text

No content

Slide 19

Slide 19 text

squashing master feature

Slide 20

Slide 20 text

thanks!