diff options
| author |  Mike Coleman <tutufan@gmail.com> | 2007-02-02 00:25:30 -0600 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2007-02-01 22:45:04 -0800 |
| commit | aacd404e775ad73188ae9157041d7cc530d5625c (patch) | |
| tree | ac6a7470168ca4fa0894a494813c285630718403 | |
| parent | Don't find objects in packs which aren't available anymore. (diff) | |
| download | tgif-aacd404e775ad73188ae9157041d7cc530d5625c.tar.xz | |
Fix some documentation typos and grammar
Also suggest user manual mention .gitignore.
Signed-off-by: Michael Coleman <tutufan@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | Documentation/core-tutorial.txt | 6 | ||||
| -rw-r--r-- | Documentation/user-manual.txt | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/Documentation/core-tutorial.txt b/Documentation/core-tutorial.txt index 86a9c7521a..1cd834b0ff 100644 --- a/Documentation/core-tutorial.txt +++ b/Documentation/core-tutorial.txt @@ -624,7 +624,7 @@ name for the state at that point. Copying repositories -------------------- -git repositories are normally totally self-sufficient and relocatable +git repositories are normally totally self-sufficient and relocatable. Unlike CVS, for example, there is no separate notion of "repository" and "working tree". A git repository normally *is* the working tree, with the local git information hidden in the `.git` @@ -1118,7 +1118,7 @@ You could do without using any branches at all, by keeping as many local repositories as you would like to have branches, and merging between them with `git pull`, just like you merge between branches. The advantage of this approach is -that it lets you keep set of files for each `branch` checked +that it lets you keep a set of files for each `branch` checked out and you may find it easier to switch back and forth if you juggle multiple lines of development simultaneously. Of course, you will pay the price of more disk usage to hold @@ -1300,7 +1300,7 @@ differences since stage 2 (i.e. your version). Publishing your work -------------------- -So we can use somebody else's work from a remote repository; but +So, we can use somebody else's work from a remote repository, but how can *you* prepare a repository to let other people pull from it? diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index b6916d11b2..6576625fa0 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -398,7 +398,7 @@ branch name, but this longer name can also be useful. Most importantly, it is a globally unique name for this commit: so if you tell somebody else the object name (for example in email), then you are guaranteed that name will refer to the same commit in their repository -that you it does in yours (assuming their repository has that commit at +that it does in yours (assuming their repository has that commit at all). Understanding history: commits, parents, and reachability @@ -617,7 +617,7 @@ the relationships between these snapshots. Git provides extremely flexible and fast tools for exploring the history of a project. -We start with one specialized tool which is useful for finding the +We start with one specialized tool that is useful for finding the commit that introduced a bug into a project. How to use bisect to find a regression @@ -1492,7 +1492,7 @@ dangling commit 13472b7c4b80851a1bc551779171dcb03655e9b5 ... ------------------------------------------------- -and watch for output that mentions "dangling commits". You can examine +You can examine one of those dangling commits with, for example, ------------------------------------------------ @@ -2923,6 +2923,8 @@ Think about how to create a clear chapter dependency graph that will allow people to get to important topics without necessarily reading everything in between. +Say something about .gitignore. + Scan Documentation/ for other stuff left out; in particular: howto's some of technical/? |