summaryrefslogtreecommitdiffstats
path: root/workshop.tex
blob: c798a16a5e2a86b7049cff1818c9082403385bdd (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
\documentclass[14pt]{beamer}
\usepackage[utf8x]{inputenc}
\usepackage[T1]{fontenc}
\usepackage{hyperref}
\usepackage{algorithmic}
\usepackage{algorithm}
\usepackage{graphicx}

\usepackage{helvet}
%\setbeamercovered{transparent}
\usecolortheme{crane}

\author[SC \& TH]{Stéphane Caron \and Thibaut Horel}
\institute{Technicolor Palo Alto}
\date{\today}
\title{Git Workshop}

\begin{document}

\begin{frame}
\titlepage
\end{frame}

\begin{frame}
...
\end{frame}

\begin{frame}
\begin{center}
\includegraphics[scale=.9]{figures/overview.pdf}
\end{center}
\end{frame}

\begin{frame}
\includegraphics[width=\textwidth]{figures/git-push.pdf}
\end{frame}

\begin{frame}
\includegraphics[width=\textwidth]{figures/git-pull.pdf}
\end{frame}

\begin{frame}
\includegraphics[width=\textwidth]{figures/git-pull-2.pdf}
\end{frame}

\begin{frame}
\includegraphics[width=\textwidth]{figures/git-merge-ok.pdf}
\end{frame}

\begin{frame}
\begin{center}
\includegraphics[scale=.9]{figures/git-merge-conflict.pdf}
\end{center}
\end{frame}

\end{document}