diff --git a/introduction/18333fig0101-tn.png b/introduction/18333fig0101-tn.png new file mode 120000 index 0000000000000000000000000000000000000000..3bbdd1ed8be7c072f0d9944b0bc0b57dd538616c --- /dev/null +++ b/introduction/18333fig0101-tn.png @@ -0,0 +1 @@ +../pics/src/18333fig0101-tn.png \ No newline at end of file diff --git a/introduction/18333fig0102-tn.png b/introduction/18333fig0102-tn.png new file mode 120000 index 0000000000000000000000000000000000000000..c3fc4bbf932f1d47137decb9460cf62edf3d8658 --- /dev/null +++ b/introduction/18333fig0102-tn.png @@ -0,0 +1 @@ +../pics/src/18333fig0102-tn.png \ No newline at end of file diff --git a/introduction/18333fig0103-tn.png b/introduction/18333fig0103-tn.png new file mode 120000 index 0000000000000000000000000000000000000000..49a1ea840c9e72c2281a3d807a37b5540f4701c6 --- /dev/null +++ b/introduction/18333fig0103-tn.png @@ -0,0 +1 @@ +../pics/src/18333fig0103-tn.png \ No newline at end of file diff --git a/introduction/introduction.tex b/introduction/introduction.tex index 34a27a54120e9c630f06b406c90e2eef81873412..4aacd0e625348ca39dc882408e783691a3848fe5 100644 --- a/introduction/introduction.tex +++ b/introduction/introduction.tex @@ -31,9 +31,8 @@ % First page of the presentation. \section{Introduction} -\begin{frame} - \frametitle{Version control.} - +\subsection{Version control} +\begin{pframe} \emph{The management of changes to documents, computer programs, large web sites, and other collections of information.} --- Wikipedia. \bigskip @@ -48,18 +47,16 @@ \end{itemize} \item Enables collaboration. \end{itemize} -\end{frame} - -\begin{frame} - \frametitle{Why should I use it?} +\end{pframe} +\subsection{Why should I use it?} +\begin{pframe} For a single user: \begin{itemize} \item Revert files to a previous state. \item Revert the entire project back to a previous state. \item Review changes made over time. \item Backup. - \item \ldots \end{itemize} \bigskip \pause @@ -70,13 +67,11 @@ \item Allow multiple people working on the same project at the same time. \item Conflict resolution. \item See who made which changes at which time. - \item \ldots \end{itemize} -\end{frame} - -\begin{frame} - \frametitle{Why should I not use it?} +\end{pframe} +\subsection{Why should I not use it?} +\begin{pframe} A list of common excuses: \begin{itemize} \item It is too much work. @@ -93,60 +88,53 @@ \begin{itemize} \item I'm too busy rewriting the code I accidentally deleted. \end{itemize} -\end{frame} - -\begin{frame} - \frametitle{Local repository.} +\end{pframe} +\subsection{Local repository} +\begin{pframe} \begin{figure}[] \begin{center} \colorbox{white}{ \hspace{0.5cm} - \includegraphics[height=0.8\textheight]{pics/18333fig0101-tn} + \includegraphics[height=0.8\textheight]{18333fig0101-tn} \hspace{0.5cm} } \end{center} \caption{Local version control diagram.} - \label{} \end{figure} -\end{frame} +\end{pframe} -\begin{frame} - \frametitle{Central repository.} - +\subsection{Central repository} +\begin{pframe} \begin{figure}[] \begin{center} \colorbox{white}{ \hspace{0.5cm} - \includegraphics[height=0.8\textheight]{pics/18333fig0102-tn} + \includegraphics[height=0.8\textheight]{18333fig0102-tn} \hspace{0.5cm} } \end{center} \caption{Centralised version control diagram.} - \label{} \end{figure} -\end{frame} - -\begin{frame} - \frametitle{Distributed repositories.} +\end{pframe} +\subsection{Distributed repositories} +\begin{pframe} \begin{figure}[] \begin{center} \colorbox{white}{ \hspace{0.5cm} - \includegraphics[height=0.8\textheight]{pics/18333fig0103-tn} + \includegraphics[height=0.8\textheight]{18333fig0103-tn} \hspace{0.5cm} } \end{center} \caption{Distributed version control diagram.} - \label{} \end{figure} -\end{frame} +\end{pframe} \section{Git} -\begin{frame} - \frametitle{The name.} - +\subsection{The name} +\begin{pframe} \emph{Git (n): A person who is deemed to be despicable or contemptible.} --- WordNet. \bigskip @@ -155,11 +143,10 @@ \emph{I'm an egotistical bastard, and I name all my projects after myself. First ``Linux'', now ``git''.} --- Linus Torvalds. \bigskip -\end{frame} - -\begin{frame} - \frametitle{History.} +\end{pframe} +\subsection{History} +\begin{pframe} Designed to replace the commercial package \emph{BitKeeper}. \begin{itemize} \item Speed. @@ -170,12 +157,11 @@ \item Able to handle large projects like the Linux kernel efficiently (speed and data size). \end{itemize} -\end{frame} +\end{pframe} \section{Remotes} -\begin{fframe} - \frametitle{A lot of choices.} - +\subsection{A lot of choices} +\begin{pframe} GitHub. \begin{itemize} \item Only free for open source projects. @@ -196,12 +182,11 @@ \vfill \permfoot{https://github.com/} -\end{fframe} +\end{pframe} \section{Practical} -\begin{fframe} - \frametitle{Outline.} - +\subsection{Outline} +\begin{pframe} We are going to: \begin{itemize} \item Create and configure a user account on the GitLab server. @@ -216,11 +201,11 @@ \vfill \permfoot{https://git.lumc.nl/} -\end{fframe} +\end{pframe} \section{Questions?} \lastpagetemplate -\begin{fframe} +\begin{pframe} \begin{center} Acknowledgements: \bigskip @@ -228,12 +213,12 @@ Martijn Vermaat - Zuotian Tatum + Wibowo Arindrarto + Zuotian Tatum \end{center} \vfill \permfoot{https://humgenprojects.lumc.nl/trac/humgenprojects/wiki/git} -\end{fframe} - +\end{pframe} \end{document} diff --git a/introduction/pics b/introduction/pics deleted file mode 120000 index aab18f589c2bd6ece1f561a0a20a0b4e284f1087..0000000000000000000000000000000000000000 --- a/introduction/pics +++ /dev/null @@ -1 +0,0 @@ -../pics/ \ No newline at end of file