Skip to content

Commit aacd404

Browse files
Mike ColemanJunio C Hamano
authored andcommitted
Fix some documentation typos and grammar
Also suggest user manual mention .gitignore. Signed-off-by: Michael Coleman <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent c715f78 commit aacd404

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

Documentation/core-tutorial.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -624,7 +624,7 @@ name for the state at that point.
624624
Copying repositories
625625
--------------------
626626

627-
git repositories are normally totally self-sufficient and relocatable
627+
git repositories are normally totally self-sufficient and relocatable.
628628
Unlike CVS, for example, there is no separate notion of
629629
"repository" and "working tree". A git repository normally *is* the
630630
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
11181118
keeping as many local repositories as you would like to have
11191119
branches, and merging between them with `git pull`, just like
11201120
you merge between branches. The advantage of this approach is
1121-
that it lets you keep set of files for each `branch` checked
1121+
that it lets you keep a set of files for each `branch` checked
11221122
out and you may find it easier to switch back and forth if you
11231123
juggle multiple lines of development simultaneously. Of
11241124
course, you will pay the price of more disk usage to hold
@@ -1300,7 +1300,7 @@ differences since stage 2 (i.e. your version).
13001300
Publishing your work
13011301
--------------------
13021302

1303-
So we can use somebody else's work from a remote repository; but
1303+
So, we can use somebody else's work from a remote repository, but
13041304
how can *you* prepare a repository to let other people pull from
13051305
it?
13061306

Documentation/user-manual.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ branch name, but this longer name can also be useful. Most
398398
importantly, it is a globally unique name for this commit: so if you
399399
tell somebody else the object name (for example in email), then you are
400400
guaranteed that name will refer to the same commit in their repository
401-
that you it does in yours (assuming their repository has that commit at
401+
that it does in yours (assuming their repository has that commit at
402402
all).
403403

404404
Understanding history: commits, parents, and reachability
@@ -617,7 +617,7 @@ the relationships between these snapshots.
617617
Git provides extremely flexible and fast tools for exploring the
618618
history of a project.
619619

620-
We start with one specialized tool which is useful for finding the
620+
We start with one specialized tool that is useful for finding the
621621
commit that introduced a bug into a project.
622622

623623
How to use bisect to find a regression
@@ -1492,7 +1492,7 @@ dangling commit 13472b7c4b80851a1bc551779171dcb03655e9b5
14921492
...
14931493
-------------------------------------------------
14941494

1495-
and watch for output that mentions "dangling commits". You can examine
1495+
You can examine
14961496
one of those dangling commits with, for example,
14971497

14981498
------------------------------------------------
@@ -2923,6 +2923,8 @@ Think about how to create a clear chapter dependency graph that will
29232923
allow people to get to important topics without necessarily reading
29242924
everything in between.
29252925

2926+
Say something about .gitignore.
2927+
29262928
Scan Documentation/ for other stuff left out; in particular:
29272929
howto's
29282930
some of technical/?

0 commit comments

Comments
 (0)