The document discusses different Git workflows and models including Git-SVN, Git-flow, and GitHub. Git-SVN replicates the centralized model of SVN by rebasing local work onto a master branch, while Git-flow uses branches like develop, features, releases, and hotfixes to structure work. GitHub allows authors and committers to differ, uses forks for contributions, and pull requests to decide when changes are ready. Overall it advocates choosing workflows and tools based on desired level of control and reality around parallel work.

1. Git, Illuminated
workflows | ++

2. svn
start from a straight line

3. git
accept reality
even if you work on master,
it’s a branch of origin/master

4. How does your story look?
git-svn git-flow github

5. git-svn
the illusion of straight-line
development
Local work is squashed or rebased onto master

6. or display reality
work that took place in parallel is
recorded in parallel

7. git-svn
rebase to bring in work

8. git-svn
rebase to bring in work

9. git-svn
rebase to bring in work

10. or display reality

11. or display reality

12. or display reality

13. Which branch is for working?
git-flow

14. git-flow
master is for releases
v2.0
v2.1

15. git-flow
master is for releases
v2.0
v2.1

16. git-flow
develop is for progress
v2.0
v2.1

17. git-flow
features are for work
v2.0
v2.1
feature/ponies

18. git-flow
releases are for testing
v2.0
v2.1

19. git-flow
releases are for testing
v2.0
v2.1

20. git-flow
releases are for testing
v2.0
release/v2.1

21. git-flow
releases are for testing
v2.0
release/v2.1

22. git-flow
releases are for testing
v2.0
v2.1

23. git-flow
hotfixes are for fixing
v2.0
v2.1
v2.0.1

24. Who decides when it’s ready?
github

25. github
author != committer

26. github
author != committer

27. github
author != committer

28. github
author != committer

29. github
fork

30. github
fork

31. github local
fork clone

32. github local

33. github local

34. github local
push

35. github local
push

36. github local
push

37. github local
push

38. github local
push
pull
request

39. github local

40. choose the shape of your history
choose your level of reality
choose tightness of control
Your story is what you make it.