Commit c1ecd8c1 authored by Mihai's avatar Mihai

Included comments from Guy.

parent 395f34d5
...@@ -29,12 +29,12 @@ Details for the next session: ...@@ -29,12 +29,12 @@ Details for the next session:
| Time | Subject | Teacher | Contents | | Time | Subject | Teacher | Contents |
| ----- | ----------------- | ----------------- | ------------------------- | | ----- | ----------------- | ----------------- | ------------------------- |
| 09:00 | [Introduction](https://git.lumc.nl/courses/gitcourse/wikis/files-most-recent/introduction.pdf) | Mihai Lefter | Welcome, version control introduction | | 09:00 | [Introduction](https://git.lumc.nl/courses/gitcourse/wikis/files-most-recent/introduction.pdf) | Mihai Lefter | Welcome, version control introduction |
| 09:30 | [Git basics](https://git.lumc.nl/courses/gitcourse/wikis/files-most-recent/basics.pdf) | Mihai Lefter | Basic Git command line flow | | 09:30 | [Git basics](https://git.lumc.nl/courses/gitcourse/wikis/files-most-recent/basics.pdf) | Guy Allard | Basic Git command line flow |
| 10:15 | [Practical](https://git.lumc.nl/courses/gitcourse/wikis/files-most-recent/basics_handouts.pdf) | | | | 10:15 | [Practical](https://git.lumc.nl/courses/gitcourse/wikis/files-most-recent/basics_handouts.pdf) | | |
| 11:00 | [The git commit graph](https://git.lumc.nl/courses/gitcourse/wikis/files-most-recent/commit_graph.pdf) | Mihai Lefter | Commit graph, branching, merging, and resolving merge conflicts. | | 11:00 | [The git commit graph](https://git.lumc.nl/courses/gitcourse/wikis/files-most-recent/commit_graph.pdf) | Mihai Lefter | Commit graph, branching, merging, and resolving merge conflicts. |
| 11:45 | [Practical](https://git.lumc.nl/courses/gitcourse/wikis/files-most-recent/commit_graph_handouts.pdf) | | | | 11:45 | [Practical](https://git.lumc.nl/courses/gitcourse/wikis/files-most-recent/commit_graph_handouts.pdf) | | |
| 12:30 | Lunch | | | | 12:30 | Lunch | | |
| 13:30 | [Collaboration: remote repositories](https://git.lumc.nl/courses/gitcourse/wikis/files-most-recent/remotes.pdf) | Jonathan Vis | Sharing and collaborating via remotes | | 13:30 | [Collaboration: remote repositories](https://git.lumc.nl/courses/gitcourse/wikis/files-most-recent/remotes.pdf) | Guy Allard | Sharing and collaborating via remotes |
| 14:15 | [Practical](https://git.lumc.nl/courses/gitcourse/wikis/files-most-recent/remotes_handouts.pdf) | | | | 14:15 | [Practical](https://git.lumc.nl/courses/gitcourse/wikis/files-most-recent/remotes_handouts.pdf) | | |
| 15:00 | Questions, closing | | | | 15:00 | Questions, closing | | |
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
\providecommand{\mySubTitle}{Git Basics} \providecommand{\mySubTitle}{Git Basics}
\providecommand{\myConference}{\courseTitle} \providecommand{\myConference}{\courseTitle}
\providecommand{\myGroup}{} \providecommand{\myGroup}{}
\providecommand{\myDepartment}{Department of Human Genetics} \providecommand{\myDepartment}{}
\providecommand{\myCenter}{} \providecommand{\myCenter}{}
\usetheme{lumc} \usetheme{lumc}
......
...@@ -99,8 +99,8 @@ Introduce your provided \textbf{password} and press enter. ...@@ -99,8 +99,8 @@ Introduce your provided \textbf{password} and press enter.
\vspace{-0.2cm} \vspace{-0.2cm}
\begin{multicols}{2} \begin{multicols}{2}
\begin{enumerate} \begin{enumerate}
\item[[ ]] it is being staged \item[[ ]] it is staged
\item[[ ]] it is being edited by the user \item[[ ]] it has been edited by the user
\item[[ ]] the user checks out a previous version of it \item[[ ]] the user checks out a previous version of it
\item[[ ]] the file is committed \item[[ ]] the file is committed
\end{enumerate} \end{enumerate}
......
...@@ -4,13 +4,13 @@ ...@@ -4,13 +4,13 @@
\input{../shared/shared.tex} \input{../shared/shared.tex}
\author{Mihai Lefter} \author{}
\title{\courseTitle} \title{\courseTitle}
\providecommand{\mySubTitle}{The git commit graph} \providecommand{\mySubTitle}{The git commit graph}
\providecommand{\myConference}{\courseTitle} \providecommand{\myConference}{\courseTitle}
\providecommand{\myGroup}{} \providecommand{\myGroup}{}
\providecommand{\myDepartment}{Department of Human Genetics} \providecommand{\myDepartment}{}
\providecommand{\myCenter}{Center for Human and Clinical Genetics} \providecommand{\myCenter}{}
\usetheme{lumc} \usetheme{lumc}
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
\section{General questions} \section{General questions}
\begin{enumerate} \begin{enumerate}
\item A branch is: \item A \gitcmd\ branch is:
\vspace{-0.2cm} \vspace{-0.2cm}
\begin{multicols}{3} \begin{multicols}{3}
\begin{enumerate}[label=(\alph*)] \begin{enumerate}[label=(\alph*)]
...@@ -305,29 +305,29 @@ Next, you will make some file changes and manipulate the commit graph even furth ...@@ -305,29 +305,29 @@ Next, you will make some file changes and manipulate the commit graph even furth
\vspace{1.5cm} \vspace{1.5cm}
\section{Solutions} % \section{Solutions}
\vspace{-0.1cm} % \vspace{-0.1cm}
%
\begin{multicols}{6} % \begin{multicols}{6}
\begin{itemize} % \begin{itemize}
\item 1.1 - c % \item 1.1 - c
\item 1.2 - f % \item 1.2 - f
\item 1.3 - c % \item 1.3 - c
\item 1.4 - d % \item 1.4 - d
\item 1.5 - d % \item 1.5 - d
\item 1.6 - a % \item 1.6 - a
\item 1.7 - c % \item 1.7 - c
\item 1.8 - d % \item 1.8 - d
\item 1.9 - c % \item 1.9 - c
\item 2.1 - d % \item 2.1 - d
\item 2.2 - b % \item 2.2 - b
\item 2.3 - d % \item 2.3 - d
\item 2.4 - c % \item 2.4 - c
\item 2.5 - a % \item 2.5 - a
\item 2.7 - b % \item 2.7 - b
\item 3.1.5 - b % \item 3.1.5 - b
\end{itemize} % \end{itemize}
\end{multicols} % \end{multicols}
\end{document} \end{document}
...@@ -8,13 +8,13 @@ ...@@ -8,13 +8,13 @@
\input{../shared/shared.tex} \input{../shared/shared.tex}
\author{Mihai Lefter} \author{}
\title{\courseTitle} \title{\courseTitle}
\providecommand{\mySubTitle}{Introduction to Version Control} \providecommand{\mySubTitle}{Introduction to Version Control}
\providecommand{\myConference}{\courseTitle} \providecommand{\myConference}{\courseTitle}
\providecommand{\myGroup}{} \providecommand{\myGroup}{}
\providecommand{\myDepartment}{Department of Human Genetics} \providecommand{\myDepartment}{}
\providecommand{\myCenter}{Center for Human and Clinical Genetics} \providecommand{\myCenter}{}
\usetheme{lumc} \usetheme{lumc}
...@@ -71,18 +71,18 @@ ...@@ -71,18 +71,18 @@
sites, and other collections of information.}\\ sites, and other collections of information.}\\
--- \textcolor{darkgray}{\href{https://en.wikipedia.org/wiki/Version_control}{Wikipedia}} --- \textcolor{darkgray}{\href{https://en.wikipedia.org/wiki/Version_control}{Wikipedia}}
\\ \\ \\ \\
\emph{A system that \textbf{records changes} to a file or set of files \emph{A system that \textbf{records changes} to a file or set of files
over time so that you can recall specific versions later.}\\ over time so that you can recall specific versions later.}\\
--- \textcolor{darkgray}{\href{https://git-scm.com/book/en/v2/Getting-Started-About-Version-Control}{https://git-scm.com/}} --- \textcolor{darkgray}{\href{https://git-scm.com/book/en/v2/Getting-Started-About-Version-Control}{https://git-scm.com/}}
\begin{tikzpicture}[remember picture,overlay] \begin{tikzpicture}[remember picture,overlay]
\node[xshift=-3.3cm,yshift=-7.2cm] at (current page.north east) {\includegraphics[width=4cm]{images/version_control-slide.pdf}}; \node[xshift=-3.3cm,yshift=-7.2cm] at (current page.north east) {\includegraphics[width=4cm]{images/version_control-slide.pdf}};
\end{tikzpicture} \end{tikzpicture}
\end{pframe} \end{pframe}
\subsection{General features} \subsection{General features}
\begin{pframe} \begin{pframe}
\begin{itemize} \begin{itemize}
\item Keep track of your files in an orderly manner. \item Keep track of your files in an orderly manner.
\begin{itemize} \begin{itemize}
\item Hide old versions. \item Hide old versions.
...@@ -96,74 +96,74 @@ ...@@ -96,74 +96,74 @@
\item Record who made changes and when. \item Record who made changes and when.
\end{itemize} \end{itemize}
\end{itemize} \end{itemize}
\end{pframe} \end{pframe}
\subsection{Step by step} \subsection{Step by step}
\begin{pframe} \begin{pframe}
\begin{center} \begin{center}
\includegraphics[width=1\textwidth]{images/vcs_example/vcs_example_00.pdf} \includegraphics[width=1\textwidth]{images/vcs_example/vcs_example_00.pdf}
\end{center} \end{center}
\end{pframe} \end{pframe}
\begin{pframe} \begin{pframe}
\begin{center} \begin{center}
\includegraphics[width=1\textwidth]{images/vcs_example/vcs_example_01.pdf} \includegraphics[width=1\textwidth]{images/vcs_example/vcs_example_01.pdf}
\end{center} \end{center}
\end{pframe} \end{pframe}
\begin{pframe} \begin{pframe}
\begin{center} \begin{center}
\includegraphics[width=1\textwidth]{images/vcs_example/vcs_example_02.pdf} \includegraphics[width=1\textwidth]{images/vcs_example/vcs_example_02.pdf}
\end{center} \end{center}
\end{pframe} \end{pframe}
\begin{pframe} \begin{pframe}
\begin{center} \begin{center}
\includegraphics[width=1\textwidth]{images/vcs_example/vcs_example_03.pdf} \includegraphics[width=1\textwidth]{images/vcs_example/vcs_example_03.pdf}
\end{center} \end{center}
\end{pframe} \end{pframe}
\begin{pframe} \begin{pframe}
\begin{center} \begin{center}
\includegraphics[width=1\textwidth]{images/vcs_example/vcs_example_04.pdf} \includegraphics[width=1\textwidth]{images/vcs_example/vcs_example_04.pdf}
\end{center} \end{center}
\end{pframe} \end{pframe}
\begin{pframe} \begin{pframe}
\begin{center} \begin{center}
\includegraphics[width=1\textwidth]{images/vcs_example/vcs_example_05.pdf} \includegraphics[width=1\textwidth]{images/vcs_example/vcs_example_05.pdf}
\end{center} \end{center}
\end{pframe} \end{pframe}
\begin{pframe} \begin{pframe}
\begin{center} \begin{center}
\includegraphics[width=1\textwidth]{images/vcs_example/vcs_example_06.pdf} \includegraphics[width=1\textwidth]{images/vcs_example/vcs_example_06.pdf}
\end{center} \end{center}
\end{pframe} \end{pframe}
\begin{pframe} \begin{pframe}
\begin{center} \begin{center}
\includegraphics[width=1\textwidth]{images/vcs_example/vcs_example_07.pdf} \includegraphics[width=1\textwidth]{images/vcs_example/vcs_example_07.pdf}
\end{center} \end{center}
\end{pframe} \end{pframe}
\begin{pframe} \begin{pframe}
\begin{center} \begin{center}
\includegraphics[width=1\textwidth]{images/vcs_example/vcs_example_08.pdf} \includegraphics[width=1\textwidth]{images/vcs_example/vcs_example_08.pdf}
\end{center} \end{center}
\end{pframe} \end{pframe}
\begin{pframe} \begin{pframe}
\begin{center} \begin{center}
\includegraphics[width=1\textwidth]{images/vcs_example/vcs_example_09.pdf} \includegraphics[width=1\textwidth]{images/vcs_example/vcs_example_09.pdf}
\end{center} \end{center}
\end{pframe} \end{pframe}
\begin{pframe} \begin{pframe}
\begin{center} \begin{center}
\includegraphics[width=1\textwidth]{images/vcs_example/vcs_example_10.pdf} \includegraphics[width=1\textwidth]{images/vcs_example/vcs_example_10.pdf}
\end{center} \end{center}
\end{pframe} \end{pframe}
\subsection{Local repository} \subsection{Local repository}
\begin{pframe} \begin{pframe}
...@@ -195,7 +195,7 @@ ...@@ -195,7 +195,7 @@
\subsection{Why should I use it?} \subsection{Why should I use it?}
\begin{pframe} \begin{pframe}
For a single user: For a single user:
\begin{itemize} \begin{itemize}
\item Revert files to a previous state. \item Revert files to a previous state.
\item Revert the entire project back to a previous state. \item Revert the entire project back to a previous state.
\item Review changes made over time. \item Review changes made over time.
...@@ -214,7 +214,7 @@ ...@@ -214,7 +214,7 @@
\subsection{Why should I not use it?} \subsection{Why should I not use it?}
\begin{pframe} \begin{pframe}
\bigskip \bigskip
\begin{itemize} \begin{itemize}
\item I have my own system. \item I have my own system.
\end{itemize} \end{itemize}
...@@ -234,7 +234,7 @@ ...@@ -234,7 +234,7 @@
\item The bugs can be \\ tracked forever. \item The bugs can be \\ tracked forever.
\item \ldots \item \ldots
\end{itemize} \end{itemize}
\begin{tikzpicture}[remember picture,overlay] \begin{tikzpicture}[remember picture,overlay]
\node[xshift=-3.4cm,yshift=-5.4cm] at (current page.north east) {\includegraphics[width=6cm]{images/project_tree.pdf}}; \node[xshift=-3.4cm,yshift=-5.4cm] at (current page.north east) {\includegraphics[width=6cm]{images/project_tree.pdf}};
\end{tikzpicture} \end{tikzpicture}
...@@ -250,7 +250,7 @@ ...@@ -250,7 +250,7 @@
\item The bugs can be \\ tracked forever. \item The bugs can be \\ tracked forever.
\item \ldots \item \ldots
\end{itemize} \end{itemize}
Eventually leading to: Eventually leading to:
\begin{itemize} \begin{itemize}
\item I'm too busy rewriting the code I accidentally deleted. \item I'm too busy rewriting the code I accidentally deleted.
...@@ -313,7 +313,7 @@ ...@@ -313,7 +313,7 @@
\item git-scm.com/mac \item git-scm.com/mac
\end{itemize} \end{itemize}
\end{itemize} \end{itemize}
Once installed you can check Git version: Once installed you can check Git version:
\begin{itemize} \begin{itemize}
\item \lstinline{git --version} \item \lstinline{git --version}
......
...@@ -2,14 +2,13 @@ ...@@ -2,14 +2,13 @@
\input{../shared/shared.tex} \input{../shared/shared.tex}
\author{Jonathan K. Vis} \author{}
\title{\courseTitle} \title{\courseTitle}
\providecommand{\mySubTitle}{Git and remote repositories} \providecommand{\mySubTitle}{Git and remote repositories}
\providecommand{\myConference}{\courseTitle} \providecommand{\myConference}{\courseTitle}
\providecommand{\myGroup}{} \providecommand{\myGroup}{}
\providecommand{\myDepartment}{Department of Human Genetics} \providecommand{\myDepartment}{}
\providecommand{\myCenter}{} \providecommand{\myCenter}{}
\providecommand{\date}{22-11-2017}
\usetheme{lumc} \usetheme{lumc}
...@@ -300,11 +299,11 @@ $ git clone user@example.com:gitproject.git ...@@ -300,11 +299,11 @@ $ git clone user@example.com:gitproject.git
\begin{pframe} \begin{pframe}
Every project belongs to a single namespace, either a: Every project belongs to a single namespace, either a:
\begin{itemize} \begin{itemize}
\item User: \item User:
\begin{itemize} \begin{itemize}
\item The project owner has direct control over the project. \item The project owner has direct control over the project.
\end{itemize} \end{itemize}
\item Group: \item Group:
\begin{itemize} \begin{itemize}
\item The group's user-level permissions will take effect. \item The group's user-level permissions will take effect.
\end{itemize} \end{itemize}
...@@ -326,7 +325,7 @@ $ git clone user@example.com:gitproject.git ...@@ -326,7 +325,7 @@ $ git clone user@example.com:gitproject.git
\item Are not listed on the public access directory. \item Are not listed on the public access directory.
\end{itemize} \end{itemize}
\end{itemize} \end{itemize}
\begin{itemize} \begin{itemize}
\item Internal projects: \item Internal projects:
\begin{itemize} \begin{itemize}
...@@ -335,7 +334,7 @@ $ git clone user@example.com:gitproject.git ...@@ -335,7 +334,7 @@ $ git clone user@example.com:gitproject.git
\item Logged in users have Guest permissions on the repository. \item Logged in users have Guest permissions on the repository.
\end{itemize} \end{itemize}
\end{itemize} \end{itemize}
\begin{itemize} \begin{itemize}
\item Public projects: \item Public projects:
\begin{itemize} \begin{itemize}
......
\usepackage{framed} \usepackage{framed}
\providecommand{\courseTitle}{Code and data management with Git} \providecommand{\courseTitle}{Code and data management with Git}
\providecommand{\myDate}{22-11-2017} \providecommand{\myDate}{12-09-2018}
\providecommand{\acknowledgements}{ \providecommand{\acknowledgements}{
Martijn Vermaat\\ Martijn Vermaat\\
Wibowo Arindrarto\\ Wibowo Arindrarto\\
......
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