Skip to content

Commit 9be0159

Browse files
committed
For Git added XKCD, link to game, few updates.
1 parent fc0bf02 commit 9be0159

File tree

1 file changed

+13
-4
lines changed

1 file changed

+13
-4
lines changed

presentation/linux_bash_metacentrum_course.tex

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4847,10 +4847,18 @@ \subsection{Data storage}
48474847
48484848
\section{Git}
48494849
4850-
% TODO Add https://xkcd.com/1597/ and https://ohmygit.org/
4851-
48524850
\begin{frame}{Git}
4853-
\tableofcontents[currentsection, sectionstyle=show/hide, hideothersubsections]
4851+
\begin{multicols}{2}
4852+
\vfill
4853+
\tableofcontents[currentsection, sectionstyle=show/hide, hideothersubsections]
4854+
\columnbreak
4855+
\begin{center}
4856+
\includegraphics[height=5.5cm]{git_xkcd.png}
4857+
\end{center}
4858+
\begin{flushright}
4859+
\url{https://xkcd.com/1597/}
4860+
\end{flushright}
4861+
\end{multicols}
48544862
\end{frame}
48554863
48564864
\subsection{Git principle}
@@ -4922,6 +4930,7 @@ \subsection{Git principle}
49224930
\item Separation of tasks
49234931
\item Keeping more versions of the project
49244932
\end{itemize}
4933+
\item \alert{Homework:} play \href{https://ohmygit.org/}{Oh My Git!} to learn more and practice
49254934
\end{itemize}
49264935
\begin{center}
49274936
\includegraphics[height=5cm]{git.png}
@@ -5002,7 +5011,7 @@ \subsection{Git basics}
50025011
\end{bashcode}
50035012
\end{frame}
50045013
5005-
\begin{frame}[fragile]{Working with Git --- settings and more}
5014+
\begin{frame}[fragile]{Working with Git --- summary, settings and more}
50065015
\begin{itemize}
50075016
\item Basically repeat in \texttt{git} \texttt{add}, \texttt{commit} and \texttt{push} to get your work to the repository, and \texttt{fetch} and \texttt{pull} to download news from central repository
50085017
\item \texttt{diff} to see local changes, \texttt{status} to see state

0 commit comments

Comments
 (0)