diff --git a/git-tutorial.tex b/git-tutorial.tex index 4c3d6ab9077c288d8e2cee2b158b50f9cca64e61..dec662e9927ee889a0503e355943cc2b1f3239b0 100644 --- a/git-tutorial.tex +++ b/git-tutorial.tex @@ -1,4 +1,4 @@ -\documentclass[a4paper,11pt,twoside]{article} +\documentclass[a4paper,10pt,twoside]{article} \usepackage{a4wide} \usepackage{palatino} \usepackage{tikz} @@ -49,7 +49,7 @@ But why use git instead of cvs, subversion, clearcase, or any other well-known version control tool? \begin{itemize} \item Git is free, both as in speech and in beer, unlike Clearcase, - Team Foundation andcial systems. + Team Foundation and other commercial systems. \item Git is distributed. When each user has her own repository copy you do not always need to have contact with a central server. \item There is a large Internet community around git making it easy to @@ -87,7 +87,7 @@ Get your Windows git client from \verb|http://git-scm.com/download/win|. \label{sec:handson} In this section we will walk through the basic git operations using this very tutorial as an example project. We will first show the -workflow for a standalone repository, typically what you would have +work-flow for a standalone repository, typically what you would have for versioning your own small projects. Then we will show what happens when we want to work in a distributed context, cooperating with other people. @@ -101,7 +101,7 @@ following stages as you work on them, see Figure~\ref{fig:lifecycle}: \begin{description} \item[Untracked:] Git does not know anything about untracked files. \item[Tracked, unmodified:] Git knows about these files, and there - have been no changes to them since lst commit. + have been no changes to them since last commit. \item[Tracked, modified:] Files tracked by git, there are changes made to the file since last commit but git does not know whether these changes should go into next commit. @@ -277,7 +277,7 @@ nothing to commit (working directory clean) A brief explanation of the command options. \verb|-a| means that all modified files will be staged before commit, without it we would only commit newly added files. \verb|-m| says that a revision comment will -follow efter it, without it a text editor (perhaps vi) would start and +follow after it, without it a text editor (perhaps vi) would start and allow you to edit a more comprehensive comment. @@ -356,7 +356,7 @@ commit 846bf870955b4eae2a5fd7bb6f5071af6b7a9003 Author: Anders Nilsson <andersn@control.lth.se> Date: Wed Mar 20 09:32:35 2013 +0100 - Addded chaos figure and some motivation + Added chaos figure and some motivation commit 95390dea5ea41624953f566fc077c8a8bdbfaf3a Author: Anders Nilsson <anders@angsro14.se> @@ -457,7 +457,6 @@ Some useful links: In general, Google is your friend, and there are literally hundreds (if not thousands) of freely available git references, Q\&A:s, and tutorials out there. -\end{document} \section{FRT090 Specifics} \label{sec:frt090} @@ -488,3 +487,7 @@ access. You do this by copying \emph{both}\footnote{Well, you only \emph{need} to copy the \emph{private} key, but it does not really make sense to not also bring with you the public part.} key files to the other user account you want to use. + + + +\end{document}