Skip to content

Commit ef6e815

Browse files
committed
Merge branch 'kh/tutorial-grammofix' into maint
* kh/tutorial-grammofix: doc: omit needless "for" doc: make the intent of sentence clearer doc: add verb in front of command to run doc: add articles (grammar)
2 parents 34d5a66 + 47437fd commit ef6e815

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

Documentation/gitcore-tutorial.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ you want to understand Git's internals.
2525
The core Git is often called "plumbing", with the prettier user
2626
interfaces on top of it called "porcelain". You may not want to use the
2727
plumbing directly very often, but it can be good to know what the
28-
plumbing does for when the porcelain isn't flushing.
28+
plumbing does when the porcelain isn't flushing.
2929

3030
Back when this document was originally written, many porcelain
3131
commands were shell scripts. For simplicity, it still uses them as
@@ -1368,7 +1368,7 @@ $ git repack
13681368
will do it for you. If you followed the tutorial examples, you
13691369
would have accumulated about 17 objects in `.git/objects/??/`
13701370
directories by now. 'git repack' tells you how many objects it
1371-
packed, and stores the packed file in `.git/objects/pack`
1371+
packed, and stores the packed file in the `.git/objects/pack`
13721372
directory.
13731373

13741374
[NOTE]
@@ -1478,7 +1478,7 @@ You can repack this private repository whenever you feel like.
14781478
A recommended work cycle for a "subsystem maintainer" who works
14791479
on that project and has an own "public repository" goes like this:
14801480

1481-
1. Prepare your work repository, by 'git clone' the public
1481+
1. Prepare your work repository, by running 'git clone' on the public
14821482
repository of the "project lead". The URL used for the
14831483
initial cloning is stored in the remote.origin.url
14841484
configuration variable.
@@ -1543,9 +1543,9 @@ like this:
15431543
Working with Others, Shared Repository Style
15441544
--------------------------------------------
15451545

1546-
If you are coming from CVS background, the style of cooperation
1546+
If you are coming from a CVS background, the style of cooperation
15471547
suggested in the previous section may be new to you. You do not
1548-
have to worry. Git supports "shared public repository" style of
1548+
have to worry. Git supports the "shared public repository" style of
15491549
cooperation you are probably more familiar with as well.
15501550

15511551
See linkgit:gitcvs-migration[7] for the details.
@@ -1635,7 +1635,7 @@ $ git show-branch
16351635
++* [master~2] Pretty-print messages.
16361636
------------
16371637

1638-
Note that you should not do Octopus because you can. An octopus
1638+
Note that you should not do Octopus just because you can. An octopus
16391639
is a valid thing to do and often makes it easier to view the
16401640
commit history if you are merging more than two independent
16411641
changes at the same time. However, if you have merge conflicts

0 commit comments

Comments
 (0)