From b7ccc0f82049fe4572b8072c1d5880603a49f204 Mon Sep 17 00:00:00 2001 From: Kenneth Odle Date: Fri, 5 Jul 2024 16:50:33 -0400 Subject: [PATCH] Git primer updates --- 005/codex-005.tex | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/005/codex-005.tex b/005/codex-005.tex index 19a08c2..de76f9a 100644 --- a/005/codex-005.tex +++ b/005/codex-005.tex @@ -27,7 +27,8 @@ \usepackage{tabto} % Use tab stops when we need to (especially in footnotes) \usepackage{microtype} % Make things neater. Thanks /u/-LeopardShark- \usepackage{tabularray} % Easy tables -\usepackage[]{FiraSans} % sans-serif font; https://tug.org/FontCatalogue/firasansregular/ +\usepackage[]{FiraSans} % sans-serif font; https://tug.org/FontCatalogue/firasansregular +\usepackage[]{footmisc} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -580,7 +581,7 @@ Go home and go into your local repo. Open a terminal in that directory and use t \input{include/pull} -\texttt{git pull} is a combination of two Git commands: \texttt{fetch} and \texttt{merge}. \texttt{git fetch} gets the change history of the tracked remote and branch, whereas \texttt{git merge} combines the current branch with the specified branch. Your local repository will now look like your remote repository. You can write to your heart's content, push those changes, and call it a day. If you're back at the hospital waiting room again some time later, you can just repeat the process.\footnote{Again, for a visual depiction of this, please visit \kref{https://www.youtube.com/watch?v=FG1NrQYXjLU}{https://www.youtube.com/watch?v=FG1NrQYXjLU}.} +\texttt{git pull} is a combination of two Git commands: \texttt{fetch} and \texttt{merge}. \texttt{git fetch} gets the change history of the tracked remote and branch, whereas \texttt{git merge} combines the current branch with the specified branch. Your local repository will now look like your remote repository. You can write to your heart's content, push those changes, and call it a day. If you're back at the hospital waiting room again some time later, you can just repeat the process.\footnote{Again, for a visual depiction of this, please visit \kref{https://www.youtube.com/watch?v=FG1NrQYXjLU}{https://www.youtube.com/watch?v=\\FG1NrQYXjLU}.} \section{Forks and Pull Requests}