Updates to branching chapter; updates to appearance

git-primer.tex

@@ -1,4 +1,4 @@
-\documentclass[twoside]{report}
+\documentclass[twoside,11pt]{report}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Packages %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -8,7 +8,6 @@
 \usepackage{amssymb}
 \usepackage{makeidx}
 \usepackage{graphicx}
-%\usepackage[nott]{kpfonts}
 \usepackage{fourier}
 \usepackage{float}
 \raggedbottom
@@ -30,6 +29,7 @@
 \usepackage{tabularray} % Easy tables
 \usepackage[]{FiraSans} % sans-serif font; https://tug.org/FontCatalogue/firasansregular
 \usepackage[]{footmisc}
+\usepackage{setspace}
 
 %\usepackage{showframe}
 %\renewcommand*\ShowFrameColor{\color{red}}
@@ -41,6 +41,11 @@
 \makeindex[intoc]
 
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Line Spacing %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\setstretch{1.1}
+
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Commands %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \graphicspath{{images/}} % Where are our images?
@@ -135,7 +140,11 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Document Information %%%%%%%%%%%%%%%%%%%%%
 \author{Kenneth John Odle}
-\title{A Git Primer}
+\title{
+	{\fontsize{36}{40}\selectfont A Git Primer}\\
+	\vspace{10mm}
+	{\fontsize{12}{16}\selectfont Typeset in \LaTeX{}}
+}
 \date{\begin{small}\today{}\end{small}}
 
 
@@ -146,7 +155,7 @@
 \maketitle
 
 \section*{Impressum}
-All contents  \copyright2024 Kenneth John Odle
+All contents  \copyright\the\year{} Kenneth John Odle
 
 
 
@@ -156,7 +165,7 @@ All contents  \copyright2024 Kenneth John Odle
 
 Git is version control software. That is, it allows you to record and track changes to a set of files over time. You can then compare different revisions or even revert some files or the entire project back to a previous version. 
 
-What I'm going to do here is describe how I understand Git. I am far from a power-user or expert in Git, so I may get some things wrong. This is \textit{not} intended to be comprehensive, but more just a way for you to get your feet wet. My goal is to encourage you to think about how you might benefit from using Git.
+Git also allows you to experiment easily without worrying about messing up your current work by creating a branch and doing your experimental work on the branch. If you like the experimental work, you can merge it into your main branch, or if you decide you don't like it, you can delete it. Git makes experimenting easier for you. 
 
 \section{What Git Can Do For You}
 
@@ -172,11 +181,11 @@ If this is your first exposure to version control software you'll make faster pr
 
 \paragraph{Concept Two: The basic time unit of Git is a \textit{commit}.} A commit is simply a snapshot of where your project stands at any given moment. When you make a commit, it's like taking a picture of your project at that particular moment.
 
-\paragraph{Concept Three: The basic space unit of Git is a \textit{repository}.} All those commmits have to live somewhere, and a repository is just a place where all those commits exist. Repositories (or ``repos'' for short) can be \textit{local}—that is, they exist on your computer only—or they can be \textit{remote}—meaning that can live on other computers somewhere else. That ``somewhere else'' is usually a publicly available server. You can create your own\footnote{You can see mine at \kref{https://git.kjodle.net/}{https://git.kjodle.net/} for example.} or you can get an account at someplace like Gitlab\footnote{\kref{https://gitlab.com/}{https://gitlab.com/}} which is for-profit and wants your money, or Github\footnote{\kref{https://github.com/}{https://github.com/}} which is now owned by Microsoft and wants your soul. 
+\paragraph{Concept Three: The basic space unit of Git is a \textit{repository}.} All those commmits have to live somewhere, and a repository is just a place where all those commits exist. Repositories (or ``repos'' for short) can be \textit{local}—that is, they exist on your computer only—or they can be \textit{remote}—meaning that can live on other computers somewhere else. That ``somewhere else'' is usually a publicly available server. You can create your own or you can get an account at someplace like Gitlab or GitHub, which are privately run for-profit companies, or at someplace like Codeberg, which is run by a non-profit entity. 
 
 You can work with a local repository only, or you can decide to work with one or more remote repositories. The choice is up to you. 
 
-\paragraph{Concept Four: Repositories are multi-dimensional.} If you make a series of commits to a repository, it will be linear in nature. This is perfectly ordinary. But you may get to a point where you want to experiment with something and you're not sure whether you'll like the new version or the old version better. Rather than commit that new version, which overrides the original version, you can \textit{branch} and have both versions existing at the same time. A branch is basically a copy of a repository at this point in time (i.e., from the last commit). You can then switch between branches and test things out. You can treat it like a sandbox—but more about that later.
+\paragraph{Concept Four: Repositories are multi-dimensional.} If you make a series of commits to a repository, it will be linear in nature. This is perfectly ordinary. But you may get to a point where you want to experiment with something and you're not sure whether you'll like the new version or the old version better. Rather than commit that new version, which overrides the original version, you can \textit{branch} and have both versions existing at the same time. A branch is basically a copy of a repository at this point in time (i.e., from the last commit). You can then switch between branches and test things out. You can treat it like a sandbox, essentially.
 
 \section{Git Clients}
 
@@ -226,6 +235,12 @@ To get a basic understanding of how branching works in Git, let's start with a s
 This is line A1.
 This is line A2.
 \end{Verbatim}
+
+Let's go ahead and commit those using the following set of commands:
+
+\input{include/branch001}
+
+Notice that we don't have a remote repository at this point, so all we are doing is making commits.
   
 
 \chapter{Remote Repositories}