diff --git a/remotes/remotes.tex b/remotes/remotes.tex index db130368426bd0ec88016168ad9e2aa87eca1cf8..6e9c27db1ef35ed5b823f129395323062e6437c1 100644 --- a/remotes/remotes.tex +++ b/remotes/remotes.tex @@ -297,8 +297,6 @@ $ git pull ==> $ git fetch origin \end{itemize} \end{frame} -% todo: create gitlab project, clone gitlab project - \section{Questions?} \lastpagetemplate \begin{frame} @@ -311,9 +309,10 @@ $ git pull ==> $ git fetch origin Zuotian Tatum - % https://www.atlassian.com/git - \end{center} + \vfill + \permfoot{http://git-scm.com/book}\\ + \permfoot{https://www.atlassian.com/git} \end{frame} \end{document} diff --git a/remotes/remotes_handouts.tex b/remotes/remotes_handouts.tex new file mode 100644 index 0000000000000000000000000000000000000000..d44ed9f321713beb4fc004d2fbc90d7348b239aa --- /dev/null +++ b/remotes/remotes_handouts.tex @@ -0,0 +1,76 @@ +\documentclass{article} +\usepackage{fullpage} + +\frenchspacing +\setlength{\parindent}{0pt} +\pagestyle{empty} + +\begin{document} +\begin{center} +{\bf Git Introduction Course} + +Git and remote repositories practical. +\end{center} +\bigskip + +\subsubsection*{Inspect the commit graph.} +We'll work from the repository you created in the previous practical. + +\begin{itemize} + \item \emph{Question:} What is you current branch and what is the hash of + the commit it points to? + \item \emph{Question:} What does the commit graph of you repository look + like? +\end{itemize} +\emph{Hint:} Use \texttt{git log} with the appropriate arguments. + +\bigskip + +\subsubsection*{Implement a feature in a new branch.} +Let's do some real work (e.g., add some documentation to the project). + +\bigskip + +Start by creating a branch for your work (give it a descriptive name) and +switch to it. + +\begin{itemize} + \item \emph{Question:} What branches are there now and what are the commits + they point to? +\end{itemize} + +\bigskip + +Implement your feature (e.g. write documentation) and commit your changes. + +\begin{itemize} + \item \emph{Question:} What does the commit graph of you repository look + like now? +\end{itemize} + +\bigskip + +\subsubsection*{Merge your feature.} +Of course we want this nice feature in our \texttt{master} branch. + +\bigskip + +\begin{itemize} + \item \emph{Question:} If you want to merge branch \texttt{B} into branch + \texttt{A}, what should be your current branch? +\end{itemize} + +\bigskip + +Merge your feature branch into \texttt{master}. + +\begin{itemize} + \item \emph{Question:} What does the commit graph of you repository look + like now? +\end{itemize} + +\bigskip + +Since you merged it, you can now delete the feature branch. + +\end{document}