Permalink
Browse files

General cleanup

  • Loading branch information...
1 parent 25939bb commit 60053b3614410d5c88801b67245b9fd4362060b7 @cbx33 committed Mar 28, 2011
Showing with 39 additions and 50 deletions.
  1. +22 −0 TODO
  2. +0 −1 TODO.latex
  3. +2 −2 afterhours6.tex
  4. +0 −10 chap3.tex
  5. +6 −0 chap4.tex
  6. +0 −13 chap6.tex
  7. +9 −24 gitt.tex
View
22 TODO
@@ -7,3 +7,25 @@ I think I am using 1.7.1 Git
Get vetting from someone on the history of version control systems
Come up with more breakout boxes :)
Come up with more items for terminology
+
+
+%git log -p
+%DIFFs
+%Patching
+
+%git show master:<path>
+%git diff -- stylesheet.css master:stylesheet.css
+%git checkout -b <branch>
+
+%SUBMODULE
+
+
+%branches
+%merge
+%remote tracking
+%Itt section about not having anything backed up
+
+%Parallel devving - ie...use both git and old for a while
+
+% git show v1.0.0^{tree}
+
View
@@ -1,3 +1,2 @@
Check for code and texttt overun issues
Create and place nice icons in top left corner of breakout boxes
-
View
@@ -1,4 +1,4 @@
-% afterhours5.tex - Afer Hours Week 5
-\chapter{After Hours Week 5}
+% afterhours6.tex - Afer Hours Week 6
+\chapter{After Hours Week 6}
\section{``History Lesson''}
\subsection{A Brief History Of Version Control}
View
@@ -577,13 +577,3 @@ \subsection{Terminology}
\item\textbf{Hunk} - A section of a diff output
\end{itemize}
-
-%git log -p
-%DIFFs
-%Patching
-
-%git show master:<path>
-%git diff -- stylesheet.css master:stylesheet.css
-%git checkout -b <branch>
-
-%SUBMODULE
View
@@ -747,4 +747,10 @@ \subsection{Commands}
\end{itemize}
\subsection{Terminology}
+\begin{itemize}
+
+\item\textbf{Conflict} - A conflict occurs when an attempt is made to reconcile multiple changes to the same section of a file at the same time.
+\item\textbf{Fast-forward Merge} - The simplest merge type, which simply winds a branch forward in time to meet the tip of another.
+
+\end{itemize}
View
@@ -217,19 +217,6 @@ \subsection{Attack of the clones}
%POSSIBLY TALK ABOUT SSH
%ssh://[user@]host.xz[:port]/path/to/repo.git/
-
-
-
-%branches
-%merge
-%remote tracking
-%Itt section about not having anything backed up
-
-%Parallel devving - ie...use both git and old for a while
-
-% git show v1.0.0^{tree}
-
-
\clearpage
\section{Summary - John's Notes}
View
@@ -2,46 +2,31 @@
\documentclass[a5paper,openright,12pt]{memoir}
% set paper size
-
-%\setstocksize{20.98cm}{14.8cm}
-%\settrimmedsize{20.98cm}{14.8cm}{*}
-
-%\settrims{0in}{0in}
-%\settypeblocksize{17.16cm}{10.73cm}{*}
-
\setlrmarginsandblock{2.16cm}{1.91cm}{*}
\setulmarginsandblock{1.91cm}{1.91cm}{*}
\checkandfixthelayout
-% import packages
+% Import packages
\usepackage{graphicx}
-%\usepackage{float}
-
-%DISABLED BECAUSE OF MARGIN ISSUE
-%\usepackage{fullpage}
-
\usepackage{color,fancyvrb,relsize}
\usepackage[final]{microtype}
\usepackage{tikz}
-% import a new font and use the sans-serif version by default
+% Import a new font and use the sans-serif version by default
\usepackage{lmodern}
\renewcommand{\familydefault}{\sfdefault}
-% put chapters and sections in the toc, only number the chapter
+% Put chapters and sections in the toc, only number the chapter
\setcounter{tocdepth}{3}
\setcounter{secnumdepth}{0}
-% make chapter names disappear
+% Make chapter names disappear
\renewcommand{\chaptername}{}
\renewcommand{\thechapter}{}
\renewcommand{\tablename}{}
\renewcommand{\thetable}{}
-% Just for reference, the margins in2.16 ou1.91
-% and page size wi14.8 hi20.98
-
-% make the pdf have clickable links
+% Make the pdf have clickable links
\usepackage[
bookmarks,
bookmarksopen,
@@ -58,7 +43,7 @@
pdfauthor={Peter Savage}]{hyperref}
-% title/author/date
+% Title/author/date
\title{Git In the Trenches}
\author{Peter Savage}
@@ -68,16 +53,16 @@
\begin{document}
-% latex preferences
+% Latex preferences
\hyphenpenalty=1000
\tolerance=1000
-% preamble stuff
+% Preamble stuff
\maketitle
\cleardoublepage
\tableofcontents
-% include all the individual chapters
+% Include all the individual chapters
\input{intro}
\input{chap1}
\input{afterhours1}

0 comments on commit 60053b3

Please sign in to comment.