Small update in makefile and content

[ai-gitflashtalk.git] / git.tex

diff --git a/git.tex b/git.tex
index f430355..9cbbe7f 100644 (file)
--- a/git.tex
+++ b/git.tex
@@ -15,7 +15,8 @@
                \item Mart Lubbers
                \item 4th year bachelor AI
                \item \url{https://github.com/dopefishh/gitflashtalk}
-               \item SHA of the commit of this presentation: {\tiny\GITAbrHash}
+               \item SHA of the commit of this presentation:
+                       {\tiny\GITAbrHash}
        \end{itemize}
 \end{frame}
 
@@ -24,7 +25,7 @@
        \begin{block}{History}
                \begin{columns} \column{0.4\linewidth}
                        \begin{itemize}
-                               \item Pronounce: \textipa{[g \'i t]} 
+                               \item Pronounce: \textipa{[g\'\i t]} 
                                \item Linus Thorvalds
                                \item Linux kernel
                        \end{itemize}
@@ -70,11 +71,11 @@
 \begin{frame}[fragile]
        \begin{block}{{\Large\Smiley\Smiley} Linux}
                Depending on the distribution you may have to do:\\
-               \lstinline{# apt-get install git}\\
-               \lstinline{# pacman -S git}\\
-               \lstinline{# yum install git}\\
-               \lstinline{# emerge --ask dev-vcs/git}\\
-               Etc...
+               \texttt{\# apt-get install git}\\
+               \texttt{\# pacman -S git}\\
+               \texttt{\# yum install git}\\
+               \texttt{\# emerge --ask dev-vcs/git}\\
+               Etc\ldots
        \end{block}
                
        \begin{block}{{\Large\Frowny\Smiley} Mac}
@@ -91,7 +92,7 @@
 \subsection{Getting started}
 \begin{frame}[fragile]
        \frametitle{Getting started}
-       \begin{block}{Check GIT version in (git)bash}
+       \begin{block}{Check GIT version in (GIT) bash}
                \begin{lstlisting}
 frobnicator@frobmachine:~\$ git --version
 git version 1.7.10.4
@@ -102,6 +103,7 @@ git version 1.7.10.4
                \begin{lstlisting}
 frobnicator@frobmachine:~/projects\$ git init myfirstproject
 Initialized empty Git repository in /home/frobnicator/projects/myfirstproject/.git/
+
 frobnicator@frobmachine:~/projects\$ ls -1 myfirstproject/.git
 branches/
 config
@@ -115,9 +117,9 @@ refs/
        \end{block}
 \end{frame}
 
-\subsection{Four(five) stages}
+\subsection{Four (five) stages}
 \begin{frame}
-       \frametitle{Four(five) stages}
+       \frametitle{Four (five) stages}
        \begin{itemize}
                \item (Stash)
                \item Workspace
@@ -136,6 +138,61 @@ refs/
        \end{figure}
 \end{frame}
 
+\begin{frame}[fragile]
+       \frametitle{Add and commit}
+       \begin{lstlisting}
+frobnicator@frobmachine :~/projects/myfirstproject\$ echo "This is a frobfile" > frobbedfile
+
+frobnicator@frobmachine:~/projects/myfirstproject\$ git status
+On branch master
+
+Initial commit
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+
+       frobbedfile
+
+nothing added to commit but untracked files present (use "git add" to track)
+       \end{lstlisting}
+\end{frame}
+
+\begin{frame}[fragile]
+       \begin{lstlisting}
+frobnicator@frobmachine:~/projects/myfirstproject\$ git add frobbedfile
+
+frobnicator@frobmachine:~/projects/myfirstproject\$ git status
+On branch master
+
+Initial commit
+
+Changes to be committed:
+  (use "git rm --cached <file>..." to unstage)
+
+       new file:   frobbedfile
+
+frobnicator@frobmachine:~/projects/myfirstproject\$ git commit
+[master (root-commit) 2b7355e] Adds frobbedfile
+ 1 file changed, 1 insertion(+)
+  create mode 100644 frobbedfile
+       \end{lstlisting}
+\end{frame}
+
+\begin{frame}
+       \frametitle{Log \& Checkout}
+       \begin{block}{\texttt{\$ git log}}
+
+       \end{block}
+\end{frame}
+
+\begin{frame}
+       \frametitle{Add and commit}
+\end{frame}
+
+\begin{frame}
+       \frametitle{Add and commit}
+\end{frame}
+
 \section{Branching}
 
 \end{document}