From: Mart Lubbers <mart@martlubbers.net>
Date: Thu, 16 Apr 2015 19:30:42 +0000 (+0200)
Subject: Outline complete
X-Git-Tag: 1.0~3
X-Git-Url: https://git.martlubbers.net/?p=ai-gitflashtalk.git;a=commitdiff_plain;h=2022f26159df929f517f5dee5802465022fd108e

Outline complete
---

diff --git a/git.tex b/git.tex
index 9cbbe7f..2ffc3bd 100644
--- a/git.tex
+++ b/git.tex
@@ -66,8 +66,7 @@
 	\end{block}
 \end{frame}
 
-\section{Basics}
-\subsection{Installation}
+\section{Installation}
 \begin{frame}[fragile]
 	\begin{block}{{\Large\Smiley\Smiley} Linux}
 		Depending on the distribution you may have to do:\\
@@ -89,7 +88,7 @@
 
 \end{frame}
 
-\subsection{Getting started}
+\section{Getting started \& Workflow}
 \begin{frame}[fragile]
 	\frametitle{Getting started}
 	\begin{block}{Check GIT version in (GIT) bash}
@@ -138,6 +137,7 @@ refs/
 	\end{figure}
 \end{frame}
 
+\section{Everything is a commit}
 \begin{frame}[fragile]
 	\frametitle{Add and commit}
 	\begin{lstlisting}
@@ -182,17 +182,33 @@ frobnicator@frobmachine:~/projects/myfirstproject\$ git commit
 	\frametitle{Log \& Checkout}
 	\begin{block}{\texttt{\$ git log}}
 
+	\end{block}
+	\begin{block}{\texttt{\$ git checkout}}
+
 	\end{block}
 \end{frame}
 
+\section{Branching and unevitable merging}
 \begin{frame}
-	\frametitle{Add and commit}
+	\frametitle{Branching}
 \end{frame}
 
 \begin{frame}
-	\frametitle{Add and commit}
+	\frametitle{Push \& Pull}
+\end{frame}
+
+\begin{frame}
+	\frametitle{Merge}
 \end{frame}
 
-\section{Branching}
+\section{Tips \& Tricks}
+\begin{frame}
+	\frametitle{\texttt{/home/frobnicator/.gitconfig}}
+\end{frame}
+
+\begin{frame}
+	\frametitle{Public key}
+
+\end{frame}
 
 \end{document}