Slide 1

Slide 1 text

Alex Tercete @alextercete Prepping Commits

Slide 2

Slide 2 text

No content

Slide 3

Slide 3 text

No content

Slide 4

Slide 4 text

No content

Slide 5

Slide 5 text

No content

Slide 6

Slide 6 text

No content

Slide 7

Slide 7 text

No content

Slide 8

Slide 8 text

No content

Slide 9

Slide 9 text

No content

Slide 10

Slide 10 text

No content

Slide 11

Slide 11 text

No content

Slide 12

Slide 12 text

No content

Slide 13

Slide 13 text

$ git add . $ git commit -m ''

Slide 14

Slide 14 text

Please stop killing Git fairies

Slide 15

Slide 15 text

$ git status $ git diff $ git add -p $ git diff --staged $ git commit

Slide 16

Slide 16 text

$ git add -p $ git commit --amend

Slide 17

Slide 17 text

$ git add -p $ git commit -m 'fixup! ' $ git rebase -i $ git show

Slide 18

Slide 18 text

$ git mergetool $ git diff --staged $ git rebase --continue

Slide 19

Slide 19 text

Alex Tercete @alextercete Thanks!

Slide 20

Slide 20 text

Credits mr.smashy https://www.flickr.com/photos/wmode/2322459915 Juraj Sedlák https://thenounproject.com/term/santoku/892545/