├── balsamiq
├── 02fig-source.bmpr
├── 03fig-source.bmpr
├── 05fig-source.bmpr
├── 06fig-source.bmpr
├── 09fig-source.bmpr
├── 11fig-source.bmpr
├── merge-types.png
├── workflow-diagrams.png
└── workflow-diagrams_2.png
├── flowcharts
├── rebase-or-merge.bmpr
├── rebase-or-merge.png
├── workflow-undoing-merge.png
└── workflow-undoing-changes.png
├── book-svg
├── convert.sh
├── 05fig04-create-branch.svg
├── 09fig02-blame.svg
├── 09fig01-sample-history.svg
├── 02fig01-centralized.svg
├── 03fig13-rebasing.svg
├── 03fig03-integration-branch.svg
├── 03fig02-reviewer-branches.svg
├── 06fig01-repo-location.svg
├── 03fig09-gitflow-release-branch.svg
├── 03fig15-merge-no-ff.svg
├── 11fig22-shared-access.svg
├── 03fig04-github-flow.svg
├── 06fig08-unmerge-shared.svg
├── 06fig02-activity01-answer01.svg
├── 06fig05-detached-head.svg
└── 03fig01-single-branch.svg
├── README.md
├── animation
├── rebasing.svg
└── rebasing-update-branch.svg
└── templates
└── oreilly-template.svg
/balsamiq/02fig-source.bmpr:
--------------------------------------------------------------------------------
https://raw.githubusercontent.com/gitforteams/diagrams/HEAD/balsamiq/02fig-source.bmpr
--------------------------------------------------------------------------------
/balsamiq/03fig-source.bmpr:
--------------------------------------------------------------------------------
https://raw.githubusercontent.com/gitforteams/diagrams/HEAD/balsamiq/03fig-source.bmpr
--------------------------------------------------------------------------------
/balsamiq/05fig-source.bmpr:
--------------------------------------------------------------------------------
https://raw.githubusercontent.com/gitforteams/diagrams/HEAD/balsamiq/05fig-source.bmpr
--------------------------------------------------------------------------------
/balsamiq/06fig-source.bmpr:
--------------------------------------------------------------------------------
https://raw.githubusercontent.com/gitforteams/diagrams/HEAD/balsamiq/06fig-source.bmpr
--------------------------------------------------------------------------------
/balsamiq/09fig-source.bmpr:
--------------------------------------------------------------------------------
https://raw.githubusercontent.com/gitforteams/diagrams/HEAD/balsamiq/09fig-source.bmpr
--------------------------------------------------------------------------------
/balsamiq/11fig-source.bmpr:
--------------------------------------------------------------------------------
https://raw.githubusercontent.com/gitforteams/diagrams/HEAD/balsamiq/11fig-source.bmpr
--------------------------------------------------------------------------------
/balsamiq/merge-types.png:
--------------------------------------------------------------------------------
https://raw.githubusercontent.com/gitforteams/diagrams/HEAD/balsamiq/merge-types.png
--------------------------------------------------------------------------------
/balsamiq/workflow-diagrams.png:
--------------------------------------------------------------------------------
https://raw.githubusercontent.com/gitforteams/diagrams/HEAD/balsamiq/workflow-diagrams.png
--------------------------------------------------------------------------------
/flowcharts/rebase-or-merge.bmpr:
--------------------------------------------------------------------------------
https://raw.githubusercontent.com/gitforteams/diagrams/HEAD/flowcharts/rebase-or-merge.bmpr
--------------------------------------------------------------------------------
/flowcharts/rebase-or-merge.png:
--------------------------------------------------------------------------------
https://raw.githubusercontent.com/gitforteams/diagrams/HEAD/flowcharts/rebase-or-merge.png
--------------------------------------------------------------------------------
/balsamiq/workflow-diagrams_2.png:
--------------------------------------------------------------------------------
https://raw.githubusercontent.com/gitforteams/diagrams/HEAD/balsamiq/workflow-diagrams_2.png
--------------------------------------------------------------------------------
/flowcharts/workflow-undoing-merge.png:
--------------------------------------------------------------------------------
https://raw.githubusercontent.com/gitforteams/diagrams/HEAD/flowcharts/workflow-undoing-merge.png
--------------------------------------------------------------------------------
/flowcharts/workflow-undoing-changes.png:
--------------------------------------------------------------------------------
https://raw.githubusercontent.com/gitforteams/diagrams/HEAD/flowcharts/workflow-undoing-changes.png
--------------------------------------------------------------------------------
/book-svg/convert.sh:
--------------------------------------------------------------------------------
1 | #!/bin/bash
2 | #FILES=/Users/emmajane/Git/1234000002182/images/diagrams-source/*.svg
3 | FILES=*.svg
4 | for f in $FILES
5 | do
6 | echo "Processing $f ..."
7 | # take action on each file. $f store current file name
8 | /Applications/Inkscape.app/Contents/Resources/bin/inkscape -D --export-width=1024 -y 1.0 --export-png rendered/$f.png $f
9 | echo "Renaming file $f.png ..."
10 | mv "rendered/$f.png" "rendered-png/gft_${f/.svg/}.png"
11 |
12 | /Applications/Inkscape.app/Contents/Resources/bin/inkscape -y 1.0 --export-pdf rendered/$f.pdf $f
13 | echo "Renaming file $f.pdf ..."
14 | mv "rendered/$f.pdf" "rendered-pdf/gft_${f/.svg/}.pdf"
15 | done
16 |
--------------------------------------------------------------------------------
/README.md:
--------------------------------------------------------------------------------
1 | # Git for Teams - Diagrams
2 |
3 | This repository contains the source files for the diagrams I have used in my books, workshops, and sessions on Git. You are welcome to use these diagrams in your own materials, and build on them so long as you provide credit.
4 |
5 | "By design" limitations are as follows:
6 |
7 | - _/book-svg_ - Black and white vector illustrations; intended for print.
8 | - File names often refer to the chapter where the illustration appeared in the first edition of Git for Teams. These file names may change over time.
9 |
10 | You should not feel restricted by these limitations and should make your own adaptations to fit the context where you will be using the diagrams. I gladly accept suggestions for improvement.
11 |
12 | The "people" used in the diagrams are available under a CC-0 license in a [separate repository](https://github.com/gitforteams/people).
13 |
14 | ## License
15 |
16 | Git for Teams Diagrams (c) by Emma Jane Hogbin Westby, and its contributing authors.
17 |
18 | Git for Teams Diagrams is licensed under a Creative Commons Attribution 3.0 Unported License.
19 |
20 | You should have received a copy of the license along with this work. If not, see http://creativecommons.org/licenses/by/3.0/.
21 |
--------------------------------------------------------------------------------
/book-svg/05fig04-create-branch.svg:
--------------------------------------------------------------------------------
1 |
2 |
3 |
41 |
--------------------------------------------------------------------------------
/book-svg/09fig02-blame.svg:
--------------------------------------------------------------------------------
1 |
2 |
3 |
37 |
--------------------------------------------------------------------------------
/animation/rebasing.svg:
--------------------------------------------------------------------------------
1 |
2 |
3 |
191 |
--------------------------------------------------------------------------------
/book-svg/09fig01-sample-history.svg:
--------------------------------------------------------------------------------
1 |
2 |
3 |
58 |
--------------------------------------------------------------------------------
/animation/rebasing-update-branch.svg:
--------------------------------------------------------------------------------
1 |
2 |
3 |
208 |
--------------------------------------------------------------------------------
/book-svg/02fig01-centralized.svg:
--------------------------------------------------------------------------------
1 |
2 |
3 |
55 |
--------------------------------------------------------------------------------
/templates/oreilly-template.svg:
--------------------------------------------------------------------------------
1 |
2 |
3 |
55 |
--------------------------------------------------------------------------------
/book-svg/03fig13-rebasing.svg:
--------------------------------------------------------------------------------
1 |
2 |
3 |
83 |
--------------------------------------------------------------------------------
/book-svg/03fig03-integration-branch.svg:
--------------------------------------------------------------------------------
1 |
2 |
3 |
101 |
--------------------------------------------------------------------------------
/book-svg/03fig02-reviewer-branches.svg:
--------------------------------------------------------------------------------
1 |
2 |
3 |
98 |
--------------------------------------------------------------------------------
/book-svg/06fig01-repo-location.svg:
--------------------------------------------------------------------------------
1 |
2 |
3 |
4 |
253 |
--------------------------------------------------------------------------------
/book-svg/03fig09-gitflow-release-branch.svg:
--------------------------------------------------------------------------------
1 |
2 |
3 |
132 |
--------------------------------------------------------------------------------
/book-svg/03fig15-merge-no-ff.svg:
--------------------------------------------------------------------------------
1 |
2 |
3 |
133 |
--------------------------------------------------------------------------------
/book-svg/11fig22-shared-access.svg:
--------------------------------------------------------------------------------
1 |
2 |
3 |
4 |
458 |
--------------------------------------------------------------------------------
/book-svg/03fig04-github-flow.svg:
--------------------------------------------------------------------------------
1 |
2 |
3 |
146 |
--------------------------------------------------------------------------------
/book-svg/06fig08-unmerge-shared.svg:
--------------------------------------------------------------------------------
1 |
2 |
3 |
4 |
414 |
--------------------------------------------------------------------------------
/book-svg/06fig02-activity01-answer01.svg:
--------------------------------------------------------------------------------
1 |
2 |
3 |
4 |
350 |
--------------------------------------------------------------------------------
/book-svg/06fig05-detached-head.svg:
--------------------------------------------------------------------------------
1 |
2 |
3 |
4 |
385 |
--------------------------------------------------------------------------------
/book-svg/03fig01-single-branch.svg:
--------------------------------------------------------------------------------
1 |
2 |
3 |
4 |
397 |
--------------------------------------------------------------------------------