Open \url{http://www.chiark.greenend.org.uk/~sgtatham/putty/latest.html} in your browser.
\medskip
\medskip
Download and run \href{https://the.earth.li/~sgtatham/putty/latest/w32/putty.exe}{\textbf{putty.exe}. (Alternative binary files, the SSH and Telnet client itself)}.
\medskip
...
...
@@ -33,6 +40,76 @@ Introduce your provided \textbf{username} and press enter.
Introduce your provided \textbf{password} and press enter.
\medskip
\section{General questions}
\begin{enumerate}
\item How can you check your local git repository state?
\vspace{-0.2cm}
\begin{multicols}{3}
\begin{enumerate}[label=(\alph*)]
\item git state
\item git repository
\item git commit
\item git status
\item git show
\item git log
\end{enumerate}
\end{multicols}
\vspace{-0.3cm}
\item What command is used to stage a file?
\vspace{-0.2cm}
\begin{multicols}{3}
\begin{enumerate}[label=(\alph*)]
\item git stage
\item git checkout
\item git add
\item git status
\item git diff
\item git log
\end{enumerate}
\end{multicols}
\vspace{-0.3cm}
\item How do you tell git what files to ignore?
\vspace{-0.2cm}
\begin{multicols}{2}
\begin{enumerate}[label=(\alph*)]
\item git ignore \{file-name\}
\item add the file paths to a file named ``.gitignore''
\item it is not possible
\item git not track \{file-name\}
\end{enumerate}
\end{multicols}
\vspace{-0.3cm}
\item The \gitcmd\ \cmd{commit}\ command:
\vspace{-0.2cm}
\begin{multicols}{2}
\begin{enumerate}[label=(\alph*)]
\item stages all the modified files
\item saves the staged files changes into the repository ``database''
\item retrieves old files into the working directory
\item shows a repository history and lets the user pick what commits to
discard
\end{enumerate}
\end{multicols}
\vspace{-0.3cm}
\item A file is brought into the modified state when:
\vspace{-0.2cm}
\begin{multicols}{2}
\begin{enumerate}
\item[[ ]] it is being staged
\item[[ ]] it is being edited by the user
\item[[ ]] the user checks out a previous version of it
\item[[ ]] the file is committed
\end{enumerate}
\end{multicols}
\vspace{-0.3cm}
\end{enumerate}
\section{Practical exercises}
\subsubsection*{Local configuration}
First, let Git know what your name and e-mail address is:
\item How do you check your local git repository state since your last commit?
\vspace{-0.2cm}
\begin{multicols}{3}
\begin{enumerate}[label=(\alph*)]
\item git state
\item git repository
\item git commit
\item git status
\item git show
\item git log
\end{enumerate}
\end{multicols}
\vspace{-0.3cm}
\item A branch is:
\vspace{-0.2cm}
\begin{multicols}{3}
...
...
@@ -43,6 +30,20 @@
\end{multicols}
\vspace{-0.3cm}
\item How can you see the commit history in a tree alike manner?
\vspace{-0.2cm}
\begin{multicols}{3}
\begin{enumerate}[label=(\alph*)]
\item git state
\item git repository
\item git commit
\item git status --tree
\item git show tree
\item git log --graph
\end{enumerate}
\end{multicols}
\vspace{-0.3cm}
\item What command could be used in joining two or more development histories (branches) together?
\vspace{-0.2cm}
\begin{multicols}{3}
...
...
@@ -70,7 +71,7 @@
\end{enumerate}
\end{multicols}
\vspace{-0.3cm}
\item Which of the following creates a new branch called \colorbox{gray!20}{brand\_new} and also checks it out?
\vspace{-0.2cm}
\begin{multicols}{3}
...
...
@@ -84,7 +85,7 @@
\end{enumerate}
\end{multicols}
\vspace{-0.3cm}
\item In order to merge a branch do we have to add and commit, or discard any changes first?
\vspace{-0.2cm}
\begin{multicols}{2}
...
...
@@ -94,7 +95,7 @@
\end{enumerate}
\end{multicols}
\vspace{-0.3cm}
\item If we want to merge \colorbox{gray!20}{brand\_new} into \colorbox{gray!20}{master}, which branch should be checked out when we run the command \colorbox{gray!20}{git merge brand\_new}?
\vspace{-0.2cm}
\begin{multicols}{2}
...
...
@@ -106,7 +107,7 @@
\end{enumerate}
\end{multicols}
\vspace{-0.3cm}
\item Which of the following commands will delete the branch \colorbox{gray!20}{brand\_new}?
\vspace{-0.2cm}
\begin{multicols}{2}
...
...
@@ -130,7 +131,7 @@
\end{enumerate}
\end{multicols}
\vspace{-0.3cm}
\end{enumerate}
\section{Inspecting the commit graph}
...
...
@@ -169,7 +170,7 @@ Please navigate to that directory and try to use the commands presented during t
\item master
\end{enumerate}
\end{multicols}
\item The commit graph looks like:
\vspace{-0.2cm}
\begin{center}
...
...
@@ -186,7 +187,7 @@ Please navigate to that directory and try to use the commands presented during t
\item advanced
\end{enumerate}
\end{multicols}
\item Merge branch \colorbox{gray!20}{documentation} into \colorbox{gray!20}{master}.
\item What merge type is performed if branch \colorbox{gray!20}{data} is merged into \colorbox{gray!20}{master}?
...
...
@@ -201,7 +202,7 @@ Please navigate to that directory and try to use the commands presented during t
\end{multicols}
\item Merge branch \colorbox{gray!20}{data} into \colorbox{gray!20}{master}.
\end{enumerate}
...
...
@@ -215,20 +216,20 @@ Next, you will make some file changes and manipulate the commit graph even furth
\begin{enumerate}
\item Checkout branch \colorbox{gray!20}{data} and create a new branch called \colorbox{gray!20}{data-europe}.
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:'Noto Sans Mono CJK TC';-inkscape-font-specification:'Noto Sans Mono CJK TC';text-align:start;text-anchor:start;fill:#696969;fill-opacity:1"
d="m 404.85653,930.75671 97.6976,0 c 0.68298,0 1.23281,0.6255 1.23281,1.40247 l 0,25.68182 c 0,0.77696 -0.54983,1.40246 -1.23281,1.40246 l -80.30756,0 -3.29129,25.04183 -4.13762,-25.04183 -9.96113,0 c -0.68298,0 -1.23281,-0.6255 -1.23281,-1.40246 l 0,-25.68182 c 0,-0.77697 0.54983,-1.40247 1.23281,-1.40247 z"
d="m 374.85653,1079.4425 157.6976,0 c 0.68298,0 1.23281,-0.6255 1.23281,-1.4025 l 0,-25.6818 c 0,-0.777 -0.54983,-1.4025 -1.23281,-1.4025 l -110.30756,0 -3.29129,-24.4025 -4.13762,24.4025 -39.96113,0 c -0.68298,0 -1.23281,0.6255 -1.23281,1.4025 l 0,25.6818 c 0,0.777 0.54983,1.4025 1.23281,1.4025 z"
d="m 404.85653,2350.7567 97.6976,0 c 0.68298,0 1.23281,0.6255 1.23281,1.4025 l 0,25.6818 c 0,0.777 -0.54983,1.4025 -1.23281,1.4025 l -80.30756,0 -3.29129,25.0418 -4.13762,-25.0418 -9.96113,0 c -0.68298,0 -1.23281,-0.6255 -1.23281,-1.4025 l 0,-25.6818 c 0,-0.777 0.54983,-1.4025 1.23281,-1.4025 z"
d="m 372.85653,2330.7567 161.6976,0 c 0.68298,0 1.23281,0.6255 1.23281,1.4025 l 0,45.6818 c 0,0.777 -0.54983,1.4025 -1.23281,1.4025 l -112.30756,0 -3.29129,25.0418 -4.13762,-25.0418 -41.96113,0 c -0.68298,0 -1.23281,-0.6255 -1.23281,-1.4025 l 0,-45.6818 c 0,-0.777 0.54983,-1.4025 1.23281,-1.4025 z"
d="m 374.85653,2519.4425 157.6976,0 c 0.68298,0 1.23281,-0.6255 1.23281,-1.4025 l 0,-25.6818 c 0,-0.777 -0.54983,-1.4025 -1.23281,-1.4025 l -110.30756,0 -3.29129,-24.4025 -4.13762,24.4025 -39.96113,0 c -0.68298,0 -1.23281,0.6255 -1.23281,1.4025 l 0,25.6818 c 0,0.777 0.54983,1.4025 1.23281,1.4025 z"
d="m 348.85653,2539.4425 197.6976,0 c 0.68298,0 1.23281,-0.6255 1.23281,-1.4025 l 0,-45.6818 c 0,-0.777 -0.54983,-1.4025 -1.23281,-1.4025 l -130.30756,0 -3.29129,-24.4025 -4.13762,24.4025 -59.96113,0 c -0.68298,0 -1.23281,0.6255 -1.23281,1.4025 l 0,45.6818 c 0,0.777 0.54983,1.4025 1.23281,1.4025 z"
d="m 372.85653,910.7567 161.6976,0 c 0.68298,0 1.23281,0.6255 1.23281,1.4025 l 0,45.6818 c 0,0.777 -0.54983,1.4025 -1.23281,1.4025 l -112.30756,0 -3.29129,25.0418 -4.13762,-25.0418 -41.96113,0 c -0.68298,0 -1.23281,-0.6255 -1.23281,-1.4025 l 0,-45.6818 c 0,-0.777 0.54983,-1.4025 1.23281,-1.4025 z"
d="m 348.85653,1099.4425 197.6976,0 c 0.68298,0 1.23281,-0.6255 1.23281,-1.4025 l 0,-45.6818 c 0,-0.777 -0.54983,-1.4025 -1.23281,-1.4025 l -130.30756,0 -3.29129,-24.4025 -4.13762,24.4025 -59.96113,0 c -0.68298,0 -1.23281,0.6255 -1.23281,1.4025 l 0,45.6818 c 0,0.777 0.54983,1.4025 1.23281,1.4025 z"