Skip to content

Commit ddd4dde

Browse files
tacker66gitster
authored andcommitted
Fix some typos and improve wording
Signed-off-by: Thomas Ackermann <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent a7bdee1 commit ddd4dde

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

Documentation/user-manual.txt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ of development leading to that point.
219219

220220
The best way to see how this works is using the linkgit:gitk[1]
221221
command; running gitk now on a Git repository and looking for merge
222-
commits will help understand how the Git organizes history.
222+
commits will help understand how Git organizes history.
223223

224224
In the following, we say that commit X is "reachable" from commit Y
225225
if commit X is an ancestor of commit Y. Equivalently, you could say
@@ -793,7 +793,7 @@ e05db0fd4f31dde7005f075a84f96b360d05984b
793793
-------------------------------------------------
794794

795795
Or you could recall that the `...` operator selects all commits
796-
contained reachable from either one reference or the other but not
796+
reachable from either one reference or the other but not
797797
both; so
798798

799799
-------------------------------------------------
@@ -820,7 +820,7 @@ You could just visually inspect the commits since e05db0fd:
820820
$ gitk e05db0fd..
821821
-------------------------------------------------
822822

823-
Or you can use linkgit:git-name-rev[1], which will give the commit a
823+
or you can use linkgit:git-name-rev[1], which will give the commit a
824824
name based on any tag it finds pointing to one of the commit's
825825
descendants:
826826

@@ -864,8 +864,8 @@ because it outputs only commits that are not reachable from v1.5.0-rc1.
864864

865865
As yet another alternative, the linkgit:git-show-branch[1] command lists
866866
the commits reachable from its arguments with a display on the left-hand
867-
side that indicates which arguments that commit is reachable from. So,
868-
you can run something like
867+
side that indicates which arguments that commit is reachable from.
868+
So, if you run something like
869869

870870
-------------------------------------------------
871871
$ git show-branch e05db0fd v1.5.0-rc0 v1.5.0-rc1 v1.5.0-rc2
@@ -877,15 +877,15 @@ available
877877
...
878878
-------------------------------------------------
879879

880-
then search for a line that looks like
880+
then a line like
881881

882882
-------------------------------------------------
883883
+ ++ [e05db0fd] Fix warnings in sha1_file.c - use C99 printf format if
884884
available
885885
-------------------------------------------------
886886

887-
Which shows that e05db0fd is reachable from itself, from v1.5.0-rc1, and
888-
from v1.5.0-rc2, but not from v1.5.0-rc0.
887+
shows that e05db0fd is reachable from itself, from v1.5.0-rc1,
888+
and from v1.5.0-rc2, and not from v1.5.0-rc0.
889889

890890
[[showing-commits-unique-to-a-branch]]
891891
Showing commits unique to a given branch
@@ -3542,7 +3542,7 @@ with Git 1.5.2 can look up the submodule commits in the repository and
35423542
manually check them out; earlier versions won't recognize the submodules at
35433543
all.
35443544

3545-
To see how submodule support works, create (for example) four example
3545+
To see how submodule support works, create four example
35463546
repositories that can be used later as a submodule:
35473547

35483548
-------------------------------------------------
@@ -3914,7 +3914,7 @@ fact that such a commit brings together ("merges") two or more
39143914
previous states represented by other commits.
39153915

39163916
In other words, while a "tree" represents a particular directory state
3917-
of a working directory, a "commit" represents that state in "time",
3917+
of a working directory, a "commit" represents that state in time,
39183918
and explains how we got there.
39193919

39203920
You create a commit object by giving it the tree that describes the

0 commit comments

Comments
 (0)