Commit f6794390 authored by Sylvain Bouveret's avatar Sylvain Bouveret
Browse files

Small style fixes in understanding-git

parent 4d04c97b
......@@ -69,7 +69,7 @@
\item Beauty of Git: \alert{very} simple data model\\
(The tool is clever, the repository format is simple\&stupid)
\item Understand the model, and the 150+ commands will become
\alert{simple} !
\alert{simple}!
\end{itemize}
\end{frame}
......@@ -143,7 +143,7 @@
\footnotesize
\begin{semiverbatim}
$ git log
commit \textbf{7a7fb77be431c284f1b6d036ab9aebf646060271}
commit \alert{7a7fb77be431c284f1b6d036ab9aebf646060271}
Author: Matthieu Moy <Matthieu.Moy@imag.fr>
Date: Wed Jul 2 20:13:49 2014 +0200
......@@ -152,10 +152,8 @@ $ find .git/objects/
.git/objects/
.git/objects/fc
.git/objects/fc/264b697de62952c9ff763b54b5b11930c9cfec
.git/objects/a4
.git/objects/a4/7665ad8a70065b68fbcfb504d85e06551c3f4d
.git/objects/7a
.git/objects/\textbf{7a/7fb77be431c284f1b6d036ab9aebf646060271}
.git/objects/\alert{7a/7fb77be431c284f1b6d036ab9aebf646060271}
.git/objects/50
.git/objects/50/a345788a8df75e0f869103a8b49cecdf95a416
.git/objects/26
......@@ -176,16 +174,12 @@ $ find .git/objects/
.git/objects/
.git/objects/fc
.git/objects/fc/264b697de62952c9ff763b54b5b11930c9cfec
.git/objects/a4
.git/objects/a4/7665ad8a70065b68fbcfb504d85e06551c3f4d
.git/objects/59
.git/objects/59/802e9b115bc606b88df4e2a83958423661d8c4
.git/objects/7a
.git/objects/7a/7fb77be431c284f1b6d036ab9aebf646060271
.git/objects/25
.git/objects/25/7cc5642cb1a054f08cc83f2d943e56fd3ebe99
.git/objects/54
.git/objects/\textbf{54/54e3b}51e81d8d9b7e807f1fc21e618880c1ac9
.git/objects/\alert{54/54e3b}51e81d8d9b7e807f1fc21e618880c1ac9
...
\end{semiverbatim}
%$
......@@ -215,7 +209,7 @@ $ find .git/objects/
\begin{frame}[fragile]
\frametitle{On-disk format: Pack files}
\small
\footnotesize
\begin{semiverbatim}
$ du -sh .git/objects/
68K .git/objects/
......@@ -231,7 +225,8 @@ $ find .git/objects/
.git/objects/info
.git/objects/info/packs
$
\end{semiverbatim}
\end{semiverbatim}
\vspace{-0.5cm}
\begin{center}
\large
$\leadsto$ More efficient format, no conceptual change\\
......@@ -245,6 +240,7 @@ $
\begin{itemize}
\item \texttt{\bfseries{} git cat-file -p} : pretty-print the content of an object
\end{itemize}
\vfill
\footnotesize
\begin{semiverbatim}
$ git log -{}-oneline
......@@ -257,6 +253,17 @@ author Matthieu Moy <Matthieu.Moy@imag.fr> 1404388746 +0200
committer Matthieu Moy <Matthieu.Moy@imag.fr> 1404388746 +0200
add README.txt
\end{semiverbatim}
\end{frame}
\begin{frame}[fragile]
\frametitle{Exploring the object database}
\begin{itemize}
\item \texttt{\bfseries{} git cat-file -p} : pretty-print the content of an object
\end{itemize}
\vfill
\footnotesize
\begin{semiverbatim}
$ git cat-file -p {\color{green!50!black}\bfseries{}59802e9b115bc606b88df4e2a83958423661d8c4}
100644 blob {\color{violet!50!black}\bfseries{}257cc5642cb1a054f08cc83f2d943e56fd3ebe99} README.txt
040000 tree 2627a0555f9b58632be848fee8a4602a1d61a05f sandbox
......@@ -292,7 +299,7 @@ Merge made by the 'recursive' strategy.
\begin{frame}[fragile]
\frametitle{Merge commits in the object
database}
\footnotesize
\scriptsize
\begin{semiverbatim}
$ git checkout -b branch HEAD^
$ echo foo > file.txt; git add file.txt
......@@ -340,8 +347,8 @@ String s; // Reference named s
s = new String("foo"); // Object pointed to by s
String s2 = s; // Two refs for the same object
\end{lstlisting}
\item In Git: likewise!
\small
\item In Git: likewise!
\footnotesize
\begin{semiverbatim}
$ git log --oneline
{\color{blue!50!black}\bfseries{}5454e3b} add README.txt
......@@ -516,28 +523,28 @@ $ git rev-parse refs/heads/master
\end{itemize}
\end{frame}
\section{Exercises}
% \section{Exercises}
\begin{frame}[fragile]
\frametitle{Exercises}
% \begin{frame}[fragile]
% \frametitle{Exercises}
\begin{itemize}
\item Visit \url{https://github.com/moy/dumb-project.git}
\item Fork it from the web interface (or just \texttt{git clone})
\item Clone it on your machine
\item Repair the dirty history!
\end{itemize}
\end{frame}
% \begin{itemize}
% \item Visit \url{https://github.com/moy/dumb-project.git}
% \item Fork it from the web interface (or just \texttt{git clone})
% \item Clone it on your machine
% \item Repair the dirty history!
% \end{itemize}
% \end{frame}
\begin{frame}[fragile]
\frametitle{If you liked this training ...}
\begin{center}
\Large ``Principes et utilisations de l'outil Git'', 1 day
training. Next iteration: April 25th 2016. Tell your friends ;-).
% \begin{frame}[fragile]
% \frametitle{If you liked this training ...}
% \begin{center}
% \Large ``Principes et utilisations de l'outil Git'', 1 day
% training. Next iteration: April 25th 2016. Tell your friends ;-).
{\tiny \url{http://formation-continue.grenoble-inp.fr/genie-logiciel-programmation/principes-et-utilisations-de-l-outil-git-681441.kjsp#page-presentation}}
\end{center}
\end{frame}
% {\tiny \url{http://formation-continue.grenoble-inp.fr/genie-logiciel-programmation/principes-et-utilisations-de-l-outil-git-681441.kjsp#page-presentation}}
% \end{center}
% \end{frame}
\end{document}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment