jab2870/Git-Presentation
1
0
Fork 0
Code Issues Pull requests Releases 2 Wiki Activity

Removes some old commented bits that won't be used

Browse source
This commit is contained in:
Jonathan Hodgson 2020-08-06 11:52:41 +01:00
parent 79a2042c1a
commit 3124da5b30
1 changed files with 5 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

46
main.latex
View file

@ -214,37 +214,6 @@
} }
\end{frame} \end{frame}
%\begin{frame}[fragile]
% \frametitle{Setting It Up}
% \framesubtitle{Preferences}
%
% \textbf{Pick One}
% \begin{minted}{bash}
% # No colour
% git config --global color.ui never
%
% # Auto colour
% git config --global color.ui auto
%
% # Force colour
% git config --global color.ui always
%
% # Overide for a command
% git -c color.ui=always status > ~/some-file
%
% \end{minted}
%
% \note{%
% On Linux systems, this is set to auto by default. Might be different on a Mac. Generally
% auto is probably what you want. It will be coloured unless you are piping the output to a
% file or another process.
%
% Take note of the incorrect spelling of colour.
%
% You can override all configuration options on an individual command basis if you like.
% }
%\end{frame}
\begin{frame} \begin{frame}
\frametitle{Terminology} \frametitle{Terminology}
\framesubtitle{Objects} \framesubtitle{Objects}
@ -283,12 +252,6 @@
.2 final. .2 final.
.3 some. .3 some.
.3 files. .3 files.
% .2 real-final.
% .3 some.
% .3 files.
% .2 actual-real-final.
% .3 some.
% .3 files.
} }
\end{column} \end{column}
\begin{column}{0.5\textwidth} \begin{column}{0.5\textwidth}
@ -316,8 +279,9 @@
} }
\end{frame} \end{frame}
\begin{frame} \begin{frame}
\frametitle{Model it} \frametitle{Improve it}
\begin{center} \begin{center}
\begin{tikzpicture} \begin{tikzpicture}
%\draw (-1.5,-1.5) rectangle (7.5,1.5); %\draw (-1.5,-1.5) rectangle (7.5,1.5);
@ -337,13 +301,13 @@
\item This is a simple representation of the folder structure we saw. \item This is a simple representation of the folder structure we saw.
\item Notice that so the computer knows the order, somewhere in each ``snapshot", we \item Notice that so the computer knows the order, somewhere in each ``snapshot", we
include a reference to the previous snapshot. include a reference to the previous snapshot.
\item This is stored along side other metadata such as a timestamp and the person
taking the snapshot.
\item We then just need to record the most recent version somewhere. \item We then just need to record the most recent version somewhere.
\end{itemize} \end{itemize}
} }
\end{frame} \end{frame}
\begin{frame} \begin{frame}
\frametitle{Commits} \frametitle{Commits}
\begin{center} \begin{center}
@ -352,7 +316,7 @@
%\node at (-2.5,0) {master}; %\node at (-2.5,0) {master};
\node[commit] at (0,0) (commit1) {93e4d3d\ldots}; \node[commit] at (0,0) (commit1) {93e4d3d\ldots};
\node[commit] at (3,0) (commit2) {2557962\ldots}; \node[commit] at (3,0) (commit2) {2557962\ldots};
\node[commit] at (6,0) (commit3) {od68560\ldots}; \node[commit,draw=red] at (6,0) (commit3) {od68560\ldots};
\draw[arrow] (commit1) -- (commit2); \draw[arrow] (commit1) -- (commit2);
\draw[arrow] (commit2) -- (commit3); \draw[arrow] (commit2) -- (commit3);
\node[draw,text width=1.8cm,anchor=north,align=center] at (0, -1.5) {\small \vdots\\[0.1cm] }; \node[draw,text width=1.8cm,anchor=north,align=center] at (0, -1.5) {\small \vdots\\[0.1cm] };