From 24457941c4c052a9941941a4ec79c39e99bcb73d Mon Sep 17 00:00:00 2001 From: Ben Lynn Date: Thu, 7 Aug 2008 20:08:23 -0700 Subject: [PATCH] PDF and single-page editions. Fixed minor typo reported by Richard Albury. --- Makefile | 4 ++-- basic.txt | 2 +- branch.txt | 2 +- custom-nochunks.xsl | 2 -- preface.txt | 7 ++++++- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index a2b2f2a..7b6114d 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ .PHONY: target clean sync push -target: book book/default.css +target: book book/default.css book.html book.pdf TXTFILES=preface.txt intro.txt basic.txt clone.txt branch.txt grandmaster.txt secrets.txt drawbacks.txt @@ -28,7 +28,7 @@ clean: -rm -rf book.xml book.html book sync: target - rsync -r book/* blynn@tl1.stanford.edu:www/gitmagic/ + rsync -r book.html book.pdf book/* blynn@tl1.stanford.edu:www/gitmagic/ public: git push blynn@git.or.cz:srv/git/gitmagic.git diff --git a/basic.txt b/basic.txt index d6d868b..be1aa93 100644 --- a/basic.txt +++ b/basic.txt @@ -89,7 +89,7 @@ In a court of law, events can be stricken from the record. Likewise, you can pic will undo just the commit with the given hash. Running *git log* reveals the revert is recorded as a new commit. -=== Dowloading Files === +=== Downloading Files === Get a copy of a project managed with Git by typing: diff --git a/branch.txt b/branch.txt index b4cf9e6..388cafe 100644 --- a/branch.txt +++ b/branch.txt @@ -119,7 +119,7 @@ It's easy to extend this trick for any number of parts. === Reorganizing a Medley === -Perhaps you like to work on all aspects of a project in the same branch. You want to keep works-in-progress to yourself and want others to see your commits only when they have been neatly organized. Make a couple of clones: +Perhaps you like to work on all aspects of a project in the same branch. You want to keep works-in-progress to yourself and want others to see your commits only when they have been neatly organized. Start a couple of branches: $ git checkout -b sanitized $ git checkout -b medley diff --git a/custom-nochunks.xsl b/custom-nochunks.xsl index b0cc9e7..8871c4b 100644 --- a/custom-nochunks.xsl +++ b/custom-nochunks.xsl @@ -2,8 +2,6 @@ - - diff --git a/preface.txt b/preface.txt index 210b422..582bcab 100644 --- a/preface.txt +++ b/preface.txt @@ -10,9 +10,14 @@ As Arthur C. Clarke observed, any sufficiently advanced technology is indistingu Rather than go into details, we provide rough instructions for particular effects. After repeated use, gradually you will understand how each trick works, and how to tailor the recipes for your needs. +.Other Editions + + - link:book.html[Single webpage]: barebones HTML, with no CSS. + - link:book.pdf[PDF file]: printer-friendly. + === Thanks! === -Kudos to Dustin Sallings, Alberto Bertogli, James Cameron, Douglas Livingstone, Michael Budde, Tarmigan and Derek Mahar for suggestions and improvements. [If I've left you out, please tell me because I often forget to update this section.] +Kudos to Dustin Sallings, Alberto Bertogli, James Cameron, Douglas Livingstone, Michael Budde, Richard Albury, Tarmigan and Derek Mahar for suggestions and improvements. [If I've left you out, please tell me because I often forget to update this section.] === Links === -- 2.11.4.GIT