Skip to content

Commit 0f505cd

Browse files
committed
Small updates of Git chapter. Added introduction caption.
1 parent 1dc460a commit 0f505cd

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

presentation/git_fire.png

234 KB
Loading

presentation/linux_bash_metacentrum_course.tex

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4954,6 +4954,10 @@ \section{Git}
49544954
\begin{multicols}{2}
49554955
\vfill
49564956
\tableofcontents[currentsection, sectionstyle=show/hide, hideothersubsections]
4957+
\vfill
4958+
\begin{center}
4959+
\includegraphics[height=3.5cm]{git_fire.png}
4960+
\end{center}
49574961
\columnbreak
49584962
\begin{center}
49594963
\includegraphics[height=5.5cm]{git_xkcd.png}
@@ -5022,7 +5026,7 @@ \subsection{Git principle}
50225026
\item Three main areas
50235027
\begin{enumerate}
50245028
\item Working directory
5025-
\item Staging (changes awaiting to be pushed to the repository)
5029+
\item Staging (changes awaiting to be pushed to central repository)
50265030
\item Git repository (remote/local)
50275031
\end{enumerate}
50285032
\item Everyone has whole repository and history (it's \enquote{distributed}) --- very robust
@@ -5051,7 +5055,7 @@ \subsection{Git basics}
50515055
\begin{frame}[fragile]{Working with Git --- start and sending changes}
50525056
\begin{bashcode}
50535057
# Create a new central repository (e.g. on a server) in empty directory
5054-
git init --bare
5058+
git init --bare # No need when establishing project e.g. on GitHub
50555059
# Create a new repository for new project (in empty directory)
50565060
git init # No need when cloning from existing repository
50575061
# If you did not start by cloning, add connection to server
@@ -5137,13 +5141,13 @@ \subsection{}
51375141
\begin{frame}{Git tasks}
51385142
\begin{enumerate}
51395143
\item Clone over SSH repository \texttt{USER@vyuka.natur.cuni.cz:/srv/dadaism} (use your credentials on the testing server) and go to \texttt{dadaism} directory.
5144+
\item Communicate with others to avoid conflicting edits.
51405145
\item Add some text files, edit existing text files. Do not add images or another non-text files, do not add large files.
51415146
\item Push your changes back to the repository.
51425147
\item Fetch changes done by others.
51435148
\item See history of changes, who did what, etc.
51445149
\item Use at least \texttt{git} commands \texttt{clone},\texttt{diff}, \texttt{status}, \texttt{add}, \texttt{commit}, \texttt{push}, \texttt{fetch}, \texttt{pull}, \texttt{log} and \texttt{gitk}.
51455150
\item You can try to play with branches --- \texttt{branch}, \texttt{checkout}, \texttt{merge}.
5146-
\item Communicate with others to avoid conflicting edits.
51475151
\end{enumerate}
51485152
\end{frame}
51495153

0 commit comments

Comments
 (0)