From 703737785a0d3cdcd2c471dbd3a6ba8599441427 Mon Sep 17 00:00:00 2001 From: Jonathan Hodgson Date: Fri, 7 Aug 2020 14:05:32 +0100 Subject: [PATCH 1/5] Add download link to readme --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index ac61162..a721812 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,10 @@ This is a presentation about Git. +## Download + +If you just want to download a copy of the presentation, you can do so [here](https://git.jonathanh.co.uk/attachments/b2f284a7-d9fe-4dda-b8e4-485d79cdfa6e). + ## Build To build it, you will need make, pdflatex and ansi-to-svg and inkscape. From 534671c188aa0c5211d2f2e1aa17f3b6e1a24867 Mon Sep 17 00:00:00 2001 From: Jonathan Hodgson Date: Fri, 7 Aug 2020 18:34:40 +0100 Subject: [PATCH 2/5] Makes date uk format --- main.latex | 1 + 1 file changed, 1 insertion(+) diff --git a/main.latex b/main.latex index a4a95b8..4e05151 100644 --- a/main.latex +++ b/main.latex @@ -15,6 +15,7 @@ \usepackage{amsmath} \usepackage{pdfpages} \usepackage{tikz} +\usepackage[UKenglish]{babel}% \usetikzlibrary{shapes.geometric, arrows} \tikzstyle{commit} = [circle, text centered, line width=2, minimum size=1.5cm, draw=blue, fill=blue!80, text=white] From 4456e16333e8472983931b2666a5f015fa8b9f1c Mon Sep 17 00:00:00 2001 From: Bob Bobbington Date: Fri, 28 Jan 2022 10:57:04 +0000 Subject: [PATCH 3/5] Adds Cow option --- greeting.py | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 greeting.py diff --git a/greeting.py b/greeting.py new file mode 100644 index 0000000..463108b --- /dev/null +++ b/greeting.py @@ -0,0 +1,25 @@ +#!/usr/bin/env python + +import sys + +def cat(): + print("Meow") + +def dog(): + print("Woof") + +def cow(): + print("Moo") + +def main(): + if len(sys.argv) > 1 and sys.argv[1] == "cat": + cat() + elif len(sys.argv) > 1 and sys.argv[1] == "dog": + dog() + elif len(sys.argv) > 1 and sys.argv[1] == "cow": + cow() + else: + print("HELLO WORLD") + +if __name__ == "__main__": + main() From 2be367ed021b85772790ca2a61923d999f7323f8 Mon Sep 17 00:00:00 2001 From: Bob Bobbington Date: Fri, 28 Jan 2022 14:53:38 +0000 Subject: [PATCH 4/5] Some small changes to the presentation --- main.latex | 75 ++++++++++++++++++++++++++++-------------- shell/fetch-merge-pull | 2 +- shell/tree-empty-git | 4 +++ 3 files changed, 55 insertions(+), 26 deletions(-) create mode 100755 shell/tree-empty-git diff --git a/main.latex b/main.latex index 4e05151..99ee6ac 100644 --- a/main.latex +++ b/main.latex @@ -252,31 +252,6 @@ } \end{frame} -\begin{frame} - \frametitle{Staging Area} - \begin{itemize} - \item Sometimes called the git index - \item An intermediate area in which you can pick files to be included in the next commit. - \item Also allows you to exclude some files from your version history. - \begin{itemize} - \item Log files - \item Binary files - \item Minified files - \end{itemize} - \end{itemize} - \note{% - This is the last thing before we start actually doing stuff (promise). - - This is particularly useful if you have multiple logically unrelated changes and want to - make separate snapshots for each. - - Also useful if when programming you write your tests along side your code, you would - normally want those to be separate snapshots. - - We will talk about .gitignore later which is another way of ignoring files - } -\end{frame} - \begin{frame}[fragile] \frametitle{Install} @@ -375,6 +350,19 @@ } \end{frame} +\begin{frame} + \frametitle{Create a repository} + \begin{center} + \includegraphics[width=\textwidth,height=0.8\textheight,keepaspectratio]{auto-shell-tree-empty-git.pdf} + \end{center} + \note{% + Do this in a live terminal. MAKE SURE YOU MAKE YOUR FONT BIGGER + + Show that the \mintinline{bash}{.git} folder has been created and do a tree to show what is + in it. + } +\end{frame} + \begin{frame}[fragile] \frametitle{Git status} @@ -389,6 +377,31 @@ } \end{frame} +\begin{frame} + \frametitle{Staging Area} + \begin{itemize} + \item Sometimes called the git index + \item An intermediate area in which you can pick files to be included in the next commit. + \item Also allows you to exclude some files from your version history. + \begin{itemize} + \item Log files + \item Binary files + \item Minified files + \end{itemize} + \end{itemize} + \note{% + This is the last thing before we start actually doing stuff (promise). + + This is particularly useful if you have multiple logically unrelated changes and want to + make separate snapshots for each. + + Also useful if when programming you write your tests along side your code, you would + normally want those to be separate snapshots. + + We will talk about .gitignore later which is another way of ignoring files + } +\end{frame} + \begin{frame}[fragile] \frametitle{Staging Area} @@ -1222,4 +1235,16 @@ } \end{frame} +\begin{frame} + \frametitle{Questions} + + You can find this presentation here: + + \href{https://git.jonathanh.co.uk/GitPresentation}{https://git.jonathanh.co.uk/GitPresentation} + + \note{% + Yes, this presentation uses git for version control + } +\end{frame} + \end{document} diff --git a/shell/fetch-merge-pull b/shell/fetch-merge-pull index f8b595a..ab9cb30 100755 --- a/shell/fetch-merge-pull +++ b/shell/fetch-merge-pull @@ -22,5 +22,5 @@ git -c color.ui=always status echo '$ git log --oneline --all --graph' git -c color.ui=always log --oneline --all --graph --decorate=short -echo '$ git merge' +echo '$ git merge origin/master' git -c color.ui=always merge origin/master diff --git a/shell/tree-empty-git b/shell/tree-empty-git new file mode 100755 index 0000000..40ec961 --- /dev/null +++ b/shell/tree-empty-git @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +echo '$ tree .git' +cd /tmp/demo +tree .git From bc88d8ba595a797e9676e2d654a51710fbda459b Mon Sep 17 00:00:00 2001 From: Bob Bobbington Date: Fri, 28 Jan 2022 14:54:48 +0000 Subject: [PATCH 5/5] Fix presentation link --- main.latex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.latex b/main.latex index 99ee6ac..8ac85bc 100644 --- a/main.latex +++ b/main.latex @@ -1240,7 +1240,7 @@ You can find this presentation here: - \href{https://git.jonathanh.co.uk/GitPresentation}{https://git.jonathanh.co.uk/GitPresentation} + \href{https://git.jonathanh.co.uk/jab2870/Git-Presentation}{https://git.jonathanh.co.uk/jab2870/Git-Presentation} \note{% Yes, this presentation uses git for version control