Merge pull request #27 from uchicago-cs/git-solo

I've made a few small changes but, overall, everything looks good. Like the Linux tutorial, it might make sense for someone (who hasn't already been involved in writing this tutorial) to work through the tutorial in case they catch any remaining issues with the tutorial.
uchicago-cs · Jul 27, 2024 · 7dee357 · 7dee357
2 parents 6567126 + e20b729
commit 7dee357
Show file tree

Hide file tree

Showing 39 changed files with 2,069 additions and 1,539 deletions.
diff --git a/Makefile b/Makefile
@@ -14,10 +14,16 @@ help:
 
 .PHONY: help Makefile
 
-_static/linux-tutorial-files.zip: tutorials/linux-tutorial-files/*
-	(cd tutorials; zip -r ../_static/linux-tutorial-files.zip linux-tutorial-files/;)
+_static/linux-tutorial-files.zip: tutorials/files/linux-tutorial-files/*
+	(cd tutorials/files/; zip -r ../../_static/linux-tutorial-files.zip linux-tutorial-files/;)
 
-tutorials/linux-tutorial-files/*:
+tutorials/files/linux-tutorial-files/*:
+	@:
+
+_static/git-basics-tutorial.zip: tutorials/files/git-basics-tutorial/*
+	(cd tutorials/files/; zip -r ../../_static/git-basics-tutorial.zip git-basics-tutorial/;)
+
+tutorials/files/git-basics-tutorial/*:
 	@:
 
 # For the deploy target to work, a worktree must be created
@@ -26,7 +32,7 @@ tutorials/linux-tutorial-files/*:
 #
 #   git worktree add -B gh-pages _build/html origin/gh-pages
 
-deploy: _static/linux-tutorial-files.zip
+deploy: _static/linux-tutorial-files.zip _static/git-basics-tutorial.zip
 	echo gitdir: $(shell pwd)/.git/worktrees/html > $(BUILDDIR)/html/.git
 	touch $(BUILDDIR)/html/.nojekyll
 	git --work-tree=$(BUILDDIR)/html/ --git-dir=$(BUILDDIR)/html/.git stash --include-untracked

diff --git a/_static/git-basics-tutorial.zip b/_static/git-basics-tutorial.zip
diff --git a/index.rst b/index.rst
@@ -56,8 +56,14 @@ This guide is divided into the following sections:
    :hidden:
    :caption: Git Tutorials
 
-   Git Basics <tutorials/git-basics.rst>
-   Advanced Git <tutorials/git-advanced.rst>
+   Introduction	<tutorials/git-intro.rst>
+   Local Repositories <tutorials/git-local.rst>
+   Preparing to use GitHub <tutorials/git-prepare-github.rst>
+   Remote Repositories <tutorials/git-remote.rst>
+   Discarding Changes and Unstaging <tutorials/git-discarding-changes.rst>
+   Viewing the Commit Log <tutorials/git-commit-log.rst>
+   Working from Multiple Locations <tutorials/git-multiple-locations.rst>
+   Working with Branches  <tutorials/git-branches.rst>
 
 .. toctree::
    :maxdepth: 2

diff --git a/tutorials/files/git-basics-tutorial/hello.py b/tutorials/files/git-basics-tutorial/hello.py
@@ -0,0 +1,4 @@
+print("Hello!")
+print("Hello, world!")
+print("Hello, universe!")
+
diff --git a/tutorials/files/git-basics-tutorial/hola.py b/tutorials/files/git-basics-tutorial/hola.py
@@ -0,0 +1,4 @@
+print("hola!")
+print("hola, mundo!")
+print("hola, universo!")
+
diff --git a/tutorials/linux-tutorial-files/.heythere → ...ials/files/linux-tutorial-files/.heythere b/tutorials/linux-tutorial-files/.heythere → ...ials/files/linux-tutorial-files/.heythere
diff --git a/tutorials/linux-tutorial-files/Hello.java → ...als/files/linux-tutorial-files/Hello.java b/tutorials/linux-tutorial-files/Hello.java → ...als/files/linux-tutorial-files/Hello.java
diff --git a/tutorials/linux-tutorial-files/hello.c → tutorials/files/linux-tutorial-files/hello.c b/tutorials/linux-tutorial-files/hello.c → tutorials/files/linux-tutorial-files/hello.c
diff --git a/tutorials/linux-tutorial-files/hello.cpp → ...ials/files/linux-tutorial-files/hello.cpp b/tutorials/linux-tutorial-files/hello.cpp → ...ials/files/linux-tutorial-files/hello.cpp
diff --git a/tutorials/linux-tutorial-files/hello.py → ...rials/files/linux-tutorial-files/hello.py b/tutorials/linux-tutorial-files/hello.py → ...rials/files/linux-tutorial-files/hello.py
diff --git a/tutorials/linux-tutorial-files/my-input.txt → ...s/files/linux-tutorial-files/my-input.txt b/tutorials/linux-tutorial-files/my-input.txt → ...s/files/linux-tutorial-files/my-input.txt
diff --git a/tutorials/linux-tutorial-files/my_echo.py → ...als/files/linux-tutorial-files/my_echo.py b/tutorials/linux-tutorial-files/my_echo.py → ...als/files/linux-tutorial-files/my_echo.py
diff --git a/tutorials/linux-tutorial-files/test.txt → ...rials/files/linux-tutorial-files/test.txt b/tutorials/linux-tutorial-files/test.txt → ...rials/files/linux-tutorial-files/test.txt