You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
\item Staging (changes awaiting to be pushed to the repository)
5029
+
\item Staging (changes awaiting to be pushed to central repository)
5026
5030
\item Git repository (remote/local)
5027
5031
\end{enumerate}
5028
5032
\item Everyone has whole repository and history (it's \enquote{distributed}) --- very robust
@@ -5051,7 +5055,7 @@ \subsection{Git basics}
5051
5055
\begin{frame}[fragile]{Working with Git --- start and sending changes}
5052
5056
\begin{bashcode}
5053
5057
# 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
5055
5059
# Create a new repository for new project (in empty directory)
5056
5060
git init # No need when cloning from existing repository
5057
5061
# If you did not start by cloning, add connection to server
@@ -5137,13 +5141,13 @@ \subsection{}
5137
5141
\begin{frame}{Git tasks}
5138
5142
\begin{enumerate}
5139
5143
\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.
5140
5145
\item Add some text files, edit existing text files. Do not add images or another non-text files, do not add large files.
5141
5146
\item Push your changes back to the repository.
5142
5147
\item Fetch changes done by others.
5143
5148
\item See history of changes, who did what, etc.
5144
5149
\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}.
5145
5150
\item You can try to play with branches --- \texttt{branch}, \texttt{checkout}, \texttt{merge}.
5146
-
\item Communicate with others to avoid conflicting edits.
0 commit comments