summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorkballou <kballou@devnulllabs.io>2017-03-18 00:12:08 -0600
committerkballou <kballou@devnulllabs.io>2017-03-18 00:12:08 -0600
commit3e87937dfab836fd97cf0e2419ad1bb3f3da61e8 (patch)
tree720e2a247cecc9f5a7a9eb5f4611114057846e5e /src
parent6c1569ecca0697f00fd58f125cb1c96a309a1ad9 (diff)
downloadgit-in-reverse-3e87937dfab836fd97cf0e2419ad1bb3f3da61e8.tar.gz
git-in-reverse-3e87937dfab836fd97cf0e2419ad1bb3f3da61e8.tar.xz
Minor Updates to Slides
* Update some titles * Remove some unnecessary images/slides * Add packfile summary slide * Update some images to include more pointers, to paint clearer picture
Diffstat (limited to 'src')
-rw-r--r--src/git-in-reverse.tex47
1 files changed, 20 insertions, 27 deletions
diff --git a/src/git-in-reverse.tex b/src/git-in-reverse.tex
index 39bbbbf..107ca47 100644
--- a/src/git-in-reverse.tex
+++ b/src/git-in-reverse.tex
@@ -163,7 +163,7 @@ What does Git store?
\end{frame}
\begin{frame}[fragile]
-\frametitle{Initializing a Repository}
+\frametitle{Initializing a Repository the Hard Way}
\lstinputlisting{code/1/1}
\end{frame}
@@ -295,12 +295,14 @@ What does Git store?
\frametitle{Git Objects, Updated}
\begin{figure}
\begin{tikzpicture}[sibling distance=3cm]
- \node[text=solarizedMagenta] at (3, 0) {68b75754}
+ \node[text=solarizedMagenta] at (4, 0) {68b75754}
child{node[text=solarizedBlue] (bar_hash) {5716ca598}
child{node[text=solarizedGreen] {bar}}}
child{node[text=solarizedBlue] {a3f555b64}
child{node[text=solarizedGreen]{foo 2}}};
- \node[text=solarizedMagenta] at (0, 0) (previous_hash) {b98c9a9f};
+ \node[text=solarizedMagenta] at (0, 0) (previous_hash) {b98c9a9f}
+ child{node[text=solarizedBlue] (foo_hash) {257cc5642}
+ child{node[text=solarizedGreen]{foo}}};
\node at (0, 1.5) (previous) {Previous Tree};
\draw[-o,thick] (previous_hash) -- (bar_hash);
\draw[->,thick] (previous) -- (previous_hash);
@@ -319,25 +321,6 @@ What does Git store?
\framesubtitle{Current Objects}
\begin{figure}
\begin{tikzpicture}[sibling distance=3cm]
- \node[text=solarizedMagenta] at (0, 0) {b98c9a9f}
- child{node[text=solarizedBlue] {257cc5642}
- child{node[text=solarizedGreen]{foo}}}
- child{node[text=solarizedBlue] {5716ca598}
- child{node[text=solarizedGreen] {bar}}};
- \node[text=solarizedMagenta] at (5, 0) {68b75754}
- child{node[text=solarizedBlue] {5716ca598}
- child{node[text=solarizedGreen] {bar}}}
- child{node[text=solarizedBlue] {a3f555b64}
- child{node[text=solarizedGreen]{foo 2}}};
-\end{tikzpicture}
-\end{figure}
-\end{frame}
-
-\begin{frame}
-\frametitle{Modifying Files}
-\framesubtitle{Current Objects}
-\begin{figure}
-\begin{tikzpicture}[sibling distance=3cm]
\node at (0, 0) {Old Tree}
child{node[text=solarizedMagenta] {b98c9a9f}
child{node[text=solarizedBlue] {257cc5642}
@@ -390,6 +373,7 @@ What does Git store?
\item{ZLIB compressed blob}
\item{Stores metadata about changes}
\item{Stores a reference to the tree being saved}
+\item{Created using \texttt{git-commit-tree}}
\end{itemize}
\end{frame}
@@ -568,7 +552,7 @@ What does Git store?
\subsection{Packfiles}
\begin{frame}
-\frametitle{Packfiles}
+\frametitle{Git± Packfiles}
\begin{itemize}
\item<2->{Tight Object Storage}
\item<3->{``Packs'' Objects Together}
@@ -593,10 +577,7 @@ What does Git store?
\frametitle{Creating Packfiles}
\framesubtitle{\texttt{git-pack-objects}}
\lstinputlisting[%
- language=bash,
- numbers=none,
- basicstyle=\scriptsize{}\ttfamily{},
- columns=fixed]{code/packfiles/1}
+ basicstyle=\scriptsize{}\ttfamily{}]{code/packfiles/1}
\end{frame}
\begin{frame}[fragile]
@@ -611,6 +592,18 @@ What does Git store?
\lstinputlisting{code/packfiles/3}
\end{frame}
+\begin{frame}
+\frametitle{Git± Packfiles}
+\begin{itemize}
+\item{``Tight Object Format''}
+\item{Opaque Format}
+\begin{itemize}
+\item{Not Accessible}
+\end{itemize}
+\item{Plumbing commands will still work}
+\end{itemize}
+\end{frame}
+
\section{Using Git±}
\begin{frame}
\frametitle{Using Git±}