Tweet
Tweet

Slide 1

Slide 1 text

Git history rewriting Simon Dollé, Botify

Slide 2

Slide 2 text

Rewrite history to : Fix mistakes Organize commits logically

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

3 Steps

Slide 9

Slide 9 text

>

Slide 10

Slide 10 text

Set destination

Slide 11

Slide 11 text

> git rebase --interactive HEAD~2

Slide 12

Slide 12 text

Modify commits

Slide 13

Slide 13 text

pick 4O7rzn bar pick 0a1b2p baz

Slide 14

Slide 14 text

pick 0a1b2p baz pick 4O7rzn bar

Slide 15

Slide 15 text

Play commits

Slide 16

Slide 16 text

>

Slide 17

Slide 17 text

Demo time

Slide 18

Slide 18 text

Be careful with history

Slide 19

Slide 19 text

Be careful with history Don’t rewrite pushed commits

Slide 20

Slide 20 text

Thanks for your attention

Slide 21

Slide 21 text

Resources : https://help.github.com/articles/interactive-rebase http://git-scm.com/book/en/Git-Tools-Rewriting-History