From ebde7f61f24c82c958387da2db72093555507717 Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Fri, 28 Sep 2007 09:44:37 -0700 Subject: [PATCH] Eliminate extra spaces in section headers --- tour.mdwn | 64 +++++++++++++++++++++++++++---------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/tour.mdwn b/tour.mdwn index fdaa9a5..c72bffe 100644 --- a/tour.mdwn +++ b/tour.mdwn @@ -39,13 +39,13 @@ or and can be [browsed online](http://git.cworth.org/git/hgbook-git) -### 2.1 Installing git on your system +### 2.1 Installing git on your system Prebuilt binary packages of git are available for many popular operating systems. These make it easy to start using git on your computer immediately. -#### 2.1.1 Linux +#### 2.1.1 Linux Because each Linux distribution has its own packaging tools, policies, and rate of development, it’s difficult to give a comprehensive set of @@ -80,7 +80,7 @@ with git, meaning GNU Interactive Tools). apt-get install git-core -#### 2.1.2 Mac OS X +#### 2.1.2 Mac OS X A git-core package is available through [macports](http://macports.org). Once macports is enabled, the command @@ -88,7 +88,7 @@ to install git is: port install git-core -#### 2.1.3 Windows +#### 2.1.3 Windows Git has long been available as part of cygwin, and works reasonably well in that environment. Some people find cygwin a particularly @@ -102,7 +102,7 @@ port of git, and WinGit, a package for installing just git itself without the development environment, (still in Alpha as of September 2007). -### 2.2 Getting started +### 2.2 Getting started To begin, we’ll use the “git version” command to find out whether git is actually installed properly. Versions 1.5 and newer of git are much @@ -113,7 +113,7 @@ upgrade. $ git version git version 1.5.3.2 -#### 2.2.1 Built-in help +#### 2.2.1 Built-in help Git provides a built-in help system. This is invaluable for those times when you find yourself stuck trying to remember how to run a @@ -135,7 +135,7 @@ present and just call out to "man git-"?] available for git-? And perhaps alos provide a "git -v help" similar to "hg -v help" for more?] -### 2.3 Working with a repository +### 2.3 Working with a repository In git, everything happens inside a repository. The repository for a project contains all of the files that “belong to” that project, @@ -146,7 +146,7 @@ a directory tree in your filesystem that git treats as special. You can rename or delete a repository any time you like, using either the command line or your file browser. -#### 2.3.1 Creating a local copy of a remote repository +#### 2.3.1 Creating a local copy of a remote repository As suggested, a repository can be copied through normal file-copying commands. But git also provides a "git clone" tool for copying a @@ -210,7 +210,7 @@ What this means for now is that we’re free to experiment with our repository, safe in the knowledge that it’s a private “sandbox” that won’t affect anyone else. -#### 2.3.2 What’s in a repository? +#### 2.3.2 What’s in a repository? When we take a more detailed look inside a repository, we can see that it contains a directory named .git. This is where git keeps all @@ -231,7 +231,7 @@ distinction is that the repository contains the history of your project, while the working directory contains a snapshot of your project at a particular point in history. -### 2.4 A tour through history +### 2.4 A tour through history One of the first things we might want to do with a new, unfamiliar repository is understand its history. The “git log” command gives us a @@ -294,7 +294,7 @@ The fields in a record of output from “git log” are as follows. The default output printed by “git log” is purely a summary; it is missing a lot of detail. -#### 2.4.1 Commits, revisions, and talking to other people +#### 2.4.1 Commits, revisions, and talking to other people As English is a notoriously sloppy language, and computer science has a hallowed history of terminological confusion (why use one term when @@ -346,7 +346,7 @@ Another useful syntax is .. which can be used to specify a range of commits. So "origin..master" specifies everything that has been committed to master since it diverged from origin. -#### 2.4.3 Viewing specific revisions +#### 2.4.3 Viewing specific revisions You can use "git log" to explore the range syntax just introduced. For example, to see a list of the most recent 3 revisions you can use @@ -400,7 +400,7 @@ created: Another useful option is -n or --max-count which, unsurprisingly, limits the maximum number of commits to be displayed. -#### 2.4.5 More detailed information +#### 2.4.5 More detailed information While the default information printed by “git log” is useful if you already know what you’re looking for, you may need to see more details @@ -485,7 +485,7 @@ same output: return 0; } -### 2.5 All about command options +### 2.5 All about command options Let’s take a brief break from exploring git commands to discuss a pattern in the way that they work; you may find this useful to keep @@ -516,7 +516,7 @@ systems. Many commands that print output of some kind can be made more quiet by passing the -q or --quiet options. -### 2.6 Making and reviewing changes +### 2.6 Making and reviewing changes Now that we have a grasp of viewing history in git, let’s take a look at making some changes and examining them. @@ -606,7 +606,7 @@ this, we use the “git diff” command. return 0; } -### 2.7 Recording changes in a new commit +### 2.7 Recording changes in a new commit We can modify files, build and test our changes, and use “git status” and “git diff” to review our changes, until we’re satisfied with what @@ -616,7 +616,7 @@ record our work in a new commit. The “git commit” command lets us create a new changeset; we’ll usually refer to this as “making a commit” or “committing”. -#### 2.7.1 Setting up a username +#### 2.7.1 Setting up a username When you try to run “git commit” for the first time, it might not do exactly what you want. Git records your name and address with each @@ -714,7 +714,7 @@ requirement that the email address actually be valid, and perhaps it's useful to be reminded which machine was used to create particular commits. -#### 2.7.2 Writing a commit message +#### 2.7.2 Writing a commit message When we commit a change, git drops us into a text editor to enter a message that will describe the modifications we’ve made in @@ -754,7 +754,7 @@ git ignores the lines that start with “#”; it uses them only to tell us which files it’s recording changes to. Modifying or deleting these lines has no effect. -#### 2.7.3 Writing a good commit message +#### 2.7.3 Writing a good commit message A good commit message will generally have a single line that summarizes the commit, a blank line, and then one or more pargraphs @@ -785,14 +785,14 @@ My personal preference is for short, but informative, commit messages that tell me something that I can’t figure out with a quick glance at the output of “git log -p". -#### 2.7.4 Aborting a commit +#### 2.7.4 Aborting a commit If you decide that you don’t want to commit while in the middle of editing a commit message, simply exit from your editor without saving the file that it’s editing. This will cause nothing to happen to either the repository or the working directory. -#### 2.7.5 Admiring our new handiwork +#### 2.7.5 Admiring our new handiwork Once we’ve finished the commit, we can use the “git show” command to display the commit we just created. As discussed previously, this @@ -916,14 +916,14 @@ the --amend example to not teach bad habits like I did above. [Note: All this bad-habit stuff was introduced by me, and was not present in Bryan's original chapter. -Carl] -### 2.8 Sharing changes +### 2.8 Sharing changes We mentioned earlier that repositories in git are self-contained. This means that the commit we just created exists only in our my-hello repository. Let’s look at a few ways that we can propagate this change into other repositories. -#### 2.8.1 Pulling changes from another repository +#### 2.8.1 Pulling changes from another repository To get started, let’s clone our original hello repository, which does not contain the change we just committed. We’ll call our temporary @@ -1042,7 +1042,7 @@ need for the equivalent of "hg update" after doing a "git pull". And the answer is no. Unlike mercurial, "git pull" and "git merge" will automatically update the workind-directory files as necessary. -#### 2.8.2 Checking out previous revisions +#### 2.8.2 Checking out previous revisions It's often useful to examine the working-tree state of some specific revision other than the tip of some branch. For example, maybe you @@ -1077,7 +1077,7 @@ checking it out again: Previous HEAD position was 0a633bf... Create a makefile Switched to branch "master" -#### 2.8.3 Pushing changes to another repository +#### 2.8.3 Pushing changes to another repository Git lets us push changes to another repository, from the repository we’re currently visiting. As with previous examples, above, we’ll @@ -1125,7 +1125,7 @@ repository already has those changes? Nothing too exciting. $ git push ../hello-push Everything up-to-date -#### 2.8.4 Sharing changes over a network +#### 2.8.4 Sharing changes over a network The commands we have covered in the previous few sections are not limited to working with local repositories. Each works in exactly the @@ -1137,7 +1137,7 @@ Open Publication License Version 1.0, 8 June 1999 -### D.1 Requirements on both unmodified and modified versions +### D.1 Requirements on both unmodified and modified versions The Open Publication works may be reproduced and distributed in whole or in part, in any medium physical or electronic, provided that the @@ -1166,12 +1166,12 @@ outer surfaces of the book the original publisher’s name shall be as large as the title of the work and cited as possessive with respect to the title. -### D.2 Copyright +### D.2 Copyright The copyright to each Open Publication is owned by its author(s) or designee. -### D.3 Scope of license +### D.3 Scope of license The following license terms apply to all Open Publication works, unless otherwise explicitly stated in the document. @@ -1191,7 +1191,7 @@ without warranty of any kind, express or implied, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose or a warranty of non-infringement. -### D.4 Requirements on modified works +### D.4 Requirements on modified works All modified versions of documents covered by this license, including translations, anthologies, compilations and partial documents, must @@ -1208,7 +1208,7 @@ meet the following requirements: assert or imply endorsement of the resulting document without the original author’s (or authors’) permission. -### D.5 Good-practice recommendations +### D.5 Good-practice recommendations In addition to the requirements of this license, it is requested from and strongly recommended of redistributors that: @@ -1227,7 +1227,7 @@ and strongly recommended of redistributors that: CD-ROM expression of an Open Publication-licensed work to its author(s). -### D.6 License options +### D.6 License options The author(s) and/or publisher of an Open Publication-licensed document may elect certain options by appending language to the -- 2.43.0