summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThibaut <thibaut@horel.org>2012-05-30 10:54:16 -0700
committerThibaut <thibaut@horel.org>2012-05-30 10:54:16 -0700
commitbbf842d17e3164f19588b4a4fc23440ce802c510 (patch)
treec34524ccedfc2e621e39ad230c87368947fae25b
parentc4dc20f3a38ba06f48d16e49ee9c8b63b4134658 (diff)
downloadgit_workshop-bbf842d17e3164f19588b4a4fc23440ce802c510.tar.gz
Basic version of the introduction shit
-rw-r--r--workshop.tex11
1 files changed, 7 insertions, 4 deletions
diff --git a/workshop.tex b/workshop.tex
index 922fd8b..b3491cb 100644
--- a/workshop.tex
+++ b/workshop.tex
@@ -65,7 +65,12 @@ Examples:
\end{itemize}
\end{frame}
-\begin{frame}
+\begin{frame}{Overview}
+\includegraphics[width=\textwidth]{figures/commits.pdf}
+\end{frame}
+
+\begin{frame}{Local vs. distant history}
+Evrything can be done locally:
\begin{center}
\includegraphics[scale=.9]{figures/overview.pdf}
\end{center}
@@ -87,9 +92,7 @@ Examples:
\includegraphics[width=\textwidth]{figures/git-merge-ok.pdf}
\end{frame}
-\begin{frame}
-\includegraphics[width=\textwidth]{figures/commits.pdf}
-\end{frame}
+
\begin{frame}
\begin{center}