Updated introduction

Split history
Added What is GIT
Added pros and cons
Started branching

diff --git a/Makefile b/Makefile
index 845a6cf..e05d6fe 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,9 @@
 SHELL:=/bin/bash
 
+.PHONY: clean clobber
+
 git.pdf: git.tex preamble.fmt 1.png
        pdflatex $< 
-       pdflatex $< 
 
 preamble.fmt: preamble.tex vc.tex
        pdflatex -ini -jobname="$(basename $<)" "&pdflatex $<\dump"
@@ -15,4 +16,7 @@ vc.tex: .git/logs/HEAD
        git log -1 --format="format:\\gdef\\GITAbrHash{%H}" > $@
 
 clean:
-       $(RM) -v *.{png,eps,aux,fmt,bbl,blg,dvi,log,out,toc,nav,snm,pdf} vc.tex
+       $(RM) -v *.{eps,aux,fmt,bbl,blg,dvi,log,out,toc,nav,snm} vc.tex
+
+clobber: clean
+       $(RM) -v *.{png,pdf}

diff --git a/git.tex b/git.tex
index 41cb2c1..bb999f3 100644 (file)
--- a/git.tex
+++ b/git.tex
@@ -20,8 +20,7 @@
 \end{frame}
 
 \begin{frame}
-       \frametitle{Why GIT?}
-       \framesubtitle{Where did GIT come from?}
+       \frametitle{Where did GIT come from?}
        \begin{block}{Since 2005}
                \begin{columns}
                        \column{0.4\linewidth}
@@ -39,9 +38,31 @@
                        \end{figure}
                \end{columns} 
        \end{block}
-       
-       \begin{block}{Why GIT}
-               Fast, scalable, simple, support for non-linear development.
+
+       \begin{block}{What is GIT?}
+               \begin{itemize}
+                       \item Version control
+               \end{itemize}
+       \end{block}
+\end{frame}
+
+\begin{frame}
+       \frametitle{Why GIT?}
+       \begin{block}{Pros}
+               \begin{itemize}
+                       \item Fast
+                       \item Scaleable
+                       \item Simple
+                       \item Support for non linear development
+                       \item Intermediate stage between committing and pushing
+               \end{itemize}
+       \end{block}
+
+       \begin{block}{Cons}
+               \begin{itemize}
+                       \item Binary files
+                       \item Intermediate stage between committing and pushing
+               \end{itemize}
        \end{block}
 \end{frame}
 

diff --git a/preamble.tex b/preamble.tex
index bf58dd1..4462333 100644 (file)
--- a/preamble.tex
+++ b/preamble.tex
@@ -5,7 +5,7 @@
 
 \input{vc.tex}
 
-\title[GIT]{Git flashtalk}
+\title[GIT]{GIT flashtalk}
 \subtitle{A short introduction to GIT}
 \author[Lubbers]{M.~Lubbers\inst{1}}
 \institute[Radboud University]{%
@@ -14,7 +14,7 @@
        Radboud University Nijmegen
 }
 \date[2015]{\today}
-\subject{Git}
+\subject{GIT}
 
 \AtBeginSection[]
 {