Skip to content

Commit 379ba14

Browse files
committed
Add repos and summary slide to staging
1 parent 00f1980 commit 379ba14

File tree

1 file changed

+31
-4
lines changed

1 file changed

+31
-4
lines changed

chapters/staging.tex

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,45 @@ \section{Staging}\label{sec:staging}
88
\node[node_inactive, fill=red!10!gray, below=2.5em of clean] (modified) {modified};
99
\node[node_inactive, fill=green!10!gray, below=2.5em of modified] (staged) {staged};
1010

11-
\draw[parent-inactive] (clean.south) -- (modified.north) node[right, pos=0.5] {\texttt{file modification}};
11+
\node[tiny-commit, above right=-3em and 10em of staged] (a1){};
12+
\node[tiny-commit, right=5em of a1] (b1){};
13+
14+
\node[tiny-commit, above=2em of a1] (a2){};
15+
\node[tiny-commit, above=2em of b1] (b2){};
16+
17+
\node<6->[tiny-commit, fill=TUDa-8a, above=2em of a2] (a3){};
18+
\node<7->[tiny-commit, fill=TUDa-8a, above=2em of b2] (b3){};
19+
20+
\draw<6->[parent] (a3) to (a2);
21+
\draw[parent] (a2) to (a1);
22+
\draw<7->[parent] (b3) to (b2);
23+
\draw[parent] (b2) to (b1);
24+
25+
\draw<7>[parent] (a3) to node[above, pos=0.5] {\texttt{push}} (b3);
26+
\draw<8>[parent] (b3) to node[above, pos=0.5] {\texttt{pull}} (a3);
27+
28+
\node[above=6em of a2, text width=3em, align=center] (localrepo) {Local Repo};
29+
\node[above=6em of b2, text width=3em, align=center] (remoterepo) {Remote Repo};
30+
31+
\draw[parent-inactive] (clean.south) -- (modified.north) node[right, pos=0.5] {\texttt{modify}};
1232
\draw[parent-inactive] (modified.south) -- (staged.north) node[right, pos=0.5] {\texttt{git add}};
13-
\draw[parent-inactive] (staged) to[out=0, in=0, looseness=2] node[right, pos=.5] {\texttt{file modification}} (modified);
33+
\draw[parent-inactive] (staged) to[out=0, in=0, looseness=2] node[right, pos=.5] {\texttt{modify}} (modified);
1434
\draw[parent-inactive] (staged) to[out=180,in=180, looseness=1.5] node[left, pos=.5] {\texttt{git commit}} (clean);
1535

1636
\node<2,5->[node] (clean-active) at (clean) {working tree clean};
1737
\node<3,5->[node, fill=red!50!gray] (modified-active) at (modified) {modified};
1838
\node<4,6->[node, fill=green!40!gray] (staged-active) at (staged) {staged};
1939

20-
\draw<3,6->[parent] (clean.south) -- (modified.north) node[right, pos=0.5] {\texttt{file modification}};
40+
\draw<3,6->[parent] (clean.south) -- (modified.north) node[right, pos=0.5] {\texttt{modify}};
2141
\draw<4,6->[parent] (modified.south) -- (staged.north) node[right, pos=0.5] {\texttt{git add}};
22-
\draw<5->[parent] (staged) to[out=0, in=0, looseness=2] node[right, pos=.5] {\texttt{file modification}} (modified);
42+
\draw<5->[parent] (staged) to[out=0, in=0, looseness=2] node[right, pos=.5] {\texttt{modify}} (modified);
2343
\draw<5->[parent] (staged) to[out=180,in=180, looseness=1.5] node[left, pos=.5] {\texttt{git commit}} (clean);
2444
\end{tikzpicture}
2545
\end{frame}
46+
47+
\begin{frame}
48+
\slidehead
49+
\vspace{-1em}
50+
\centering
51+
\includegraphics[scale=.3]{../pictures/structure-overview}
52+
\end{frame}

0 commit comments

Comments
 (0)