Small update in makefile and content

[ai-gitflashtalk.git] / git.tex

diff --git a/git.tex b/git.tex
index eef261c..9cbbe7f 100644 (file)
--- a/git.tex
+++ b/git.tex
@@ -71,10 +71,10 @@
 \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}\\
+               \texttt{\# apt-get install git}\\
+               \texttt{\# pacman -S git}\\
+               \texttt{\# yum install git}\\
+               \texttt{\# emerge --ask dev-vcs/git}\\
                Etc\ldots
        \end{block}
                
@@ -92,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
@@ -103,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
@@ -140,7 +141,8 @@ refs/
 \begin{frame}[fragile]
        \frametitle{Add and commit}
        \begin{lstlisting}
-frobnicator@frobmachine:~/projects/myfirstproject\$ echo "This is a frobfile" > frobbedfile
+frobnicator@frobmachine :~/projects/myfirstproject\$ echo "This is a frobfile" > frobbedfile
+
 frobnicator@frobmachine:~/projects/myfirstproject\$ git status
 On branch master
 
@@ -158,6 +160,7 @@ nothing added to commit but untracked files present (use "git add" to track)
 \begin{frame}[fragile]
        \begin{lstlisting}
 frobnicator@frobmachine:~/projects/myfirstproject\$ git add frobbedfile
+
 frobnicator@frobmachine:~/projects/myfirstproject\$ git status
 On branch master
 
@@ -167,6 +170,7 @@ 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(+)
@@ -175,7 +179,10 @@ frobnicator@frobmachine:~/projects/myfirstproject\$ git commit
 \end{frame}
 
 \begin{frame}
-       \frametitle{Push}
+       \frametitle{Log \& Checkout}
+       \begin{block}{\texttt{\$ git log}}
+
+       \end{block}
 \end{frame}
 
 \begin{frame}