Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Removed blank lines affecting html conversion

  • Loading branch information...
commit fdee3a0b41f85ee235bc01a3469b3a8e5b1fc44c 1 parent 0e0bdfe
@cbx33 authored
View
1  afterhours1.tex
@@ -2,7 +2,6 @@
\chapter{After Hours Week 1}
\section{``History Lesson''}
\subsection{A Brief History of Version Control}
-
\subsubsection{The Very Early Days}
Version control systems have been around for forty years (2011 at the time of writing).
During this time they have undergone an intense amount of change and have evolved into some of the most incredibly powerful tools utilised in software development today.
View
4 afterhours2.tex
@@ -2,9 +2,7 @@
\chapter{After Hours Week 2}
\section{``A Little Of Git's Internals''}
\subsection{A Look At Plumbing}
-\index{Plumbing}
-\index{Git!directory structure}
-This After Hours section is going to get a little deep.
+\index{Plumbing}\index{Git!directory structure}This After Hours section is going to get a little deep.
For some of you it may be more information than you bargained for.
However, sometimes, when the worst happens, it is comforting to know that you at least have a basic understanding of what is happening under the hood.
These After Hours sections are designed to give you that knowledge.
View
6 afterhours3.tex
@@ -2,8 +2,7 @@
\chapter{After Hours Week 3}
\section{``A Closer Look At Diffs and Tags''}
\subsection{The Diff Utility}
-\index{diff!algorithm}
-We learnt in \emph{Week 3} how to work with a diff, and what a diff actually represents.
+\index{diff!algorithm}We learnt in \emph{Week 3} how to work with a diff, and what a diff actually represents.
It is interesting to note how old the \texttt{diff} utility actually is and how it works.
The diff algorithm was developed in the early 1970s and the research published in 1976, by Douglas McIlroy, who wrote the original diff utility and James Hunt.
The algorithm we use today to perform diffs has become known as the Hunt-McIlroy after the research papers authors.
@@ -48,8 +47,7 @@ \subsection{The Diff Utility}
This section was included to give you some idea of how Git performs some of its actions internally.
\subsection{More about tags}
-\index{tagging!internals}
-Tags can actually do a little more than just hold a single identifier to a specific commit.
+\index{tagging!internals}Tags can actually do a little more than just hold a single identifier to a specific commit.
A tag can also have a log message with it, similar to the commit objects we discussed earlier.
In order to invoke this option, we need to use the \texttt{git tag -m 'message'} option.
This will allow us to supply a message to be stored along with the tag.
View
9 afterhours4.tex
@@ -2,17 +2,11 @@
\chapter{After Hours Week 4}
\section{``Merge merge merge''}
\subsection{How does merging work?}
-
To start with, we need to define which merging strategy we are talking about.
In Git there are multiple ways to instruct a merge to take place.
Below is a brief list of the options that you can supply to the \texttt{git merge} command along with a brief description of how each one affects the merge process.
We will explain the details a little more further on.
-\index{merging!types}
-\index{merging!types!resolve}
-\index{merging!types!recursive}
-\index{merging!types!octopus}
-\index{merging!types!ours}
-\index{merging!types!subtree}
+\index{merging!types}\index{merging!types!resolve}\index{merging!types!recursive}\index{merging!types!octopus}\index{merging!types!ours}\index{merging!types!subtree}
\begin{itemize}
\item\textbf{resolve} - A two headed merge strategy using a 3-way merge algorithm.
@@ -84,7 +78,6 @@ \subsection{How does merging work?}
\section{``Grepping your life away''}
\subsection{A subtle twist on searching}
-
As well as our \texttt{git log} tool, which we have used for searching, it is useful to know that there is actually another way to search for strings in your current directory.
We can use the \indexgit{grep} tool to find all files in our working tree which have a certain pattern in them.
View
1  afterhours5.tex
@@ -2,7 +2,6 @@
\chapter{After Hours Week 5}
\section{``Splitting up commits the easy way''}
\subsection{Taking commits that little bit further}
-
Sometimes, putting everything in a single commit just is not a good idea.
Imagine you have pulled in number of updates to your working directory.
You may want to split these up.
View
1  afterhours6.tex
@@ -3,7 +3,6 @@
\chapter{After Hours Week 6}
\section{``Tug of war''}
\subsection{Taking the push with the pull}
-
We have spoken in fairly great length about how remote repositories work.
We have seen how the \texttt{git remote} tool is used to create the various references to remote repositories, but we have no real understanding about what this means in terms of Git's internals.
Just in the same way a branch is a single file that contains a pointer to a reference, a remote repository has to be handled within Git somehow.
View
1  chap2.tex
@@ -307,7 +307,6 @@ \subsection{Committing the Uncommitted}
# my_third_committed_file
nothing added to commit but untracked files present (use "git add" to track)
john@satsuki:~/coderepo$
-
\end{code}
\section{Day 4 - ``Let's do this right, not fast''}
Please sign in to comment.
Something went wrong with that request. Please try again.