Skip to content

Commit ad871c2

Browse files
committed
update presentation
1 parent 560094a commit ad871c2

File tree

5 files changed

+5
-4
lines changed

5 files changed

+5
-4
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ default:git.png
22

33
git.png:git.dot Makefile
44
dot -Tpng git.dot -o git.png
5-
convert git.png -resize 80% git.png
5+
convert git.png -resize 70% git.png

git.dot

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ digraph G {
22
aize = "4,4"
33
compound=true;
44
{
5-
NewProject[label="New Project", shape=doublecircle];
65
ExistingProject[label="Existing Project", shape=doublecircle];
6+
NewProject[label="New Project", shape=doublecircle];
77
rank=same;
88
};
99

@@ -19,7 +19,8 @@ digraph G {
1919
Unstaged -> Staged [label="git diff # to understand changes\ngit add <filenames...>"];
2020
Staged -> UpToDate [label="git commit -m 'describe changes'"];
2121

22-
{Conflict; Point[shape=point, label=""];
22+
{Fetched; Conflict;
23+
Point[shape=point, label=""];
2324
rank=same;
2425
}
2526

git.png

-82 KB
Loading

pres.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ print(pwd)
105105
- `diff`, `status`, `log` - What state am I in?
106106

107107
---
108-
108+
# Workflow Map
109109
![simplest git workflow](./git.png)
110110

111111
---

presentation.pdf

94 KB
Binary file not shown.

0 commit comments

Comments
 (0)