Fix some typos and improve wording
Signed-off-by: Thomas Ackermann <th.acker@arcor.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Thomas Ackermann committed
Aug 27, 2013 at 19:59 UTC
ddd4ddef78163a0f01e7a727c69ba8bd4efc07c2
1 file changed
+10
-10
Documentation/user-manual.txt
+10
-10
@@ -219,7 +219,7 @@ of development leading to that point.
219
220
The best way to see how this works is using the linkgit:gitk[1]
221
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.
223
224
In the following, we say that commit X is "reachable" from commit Y
225
if commit X is an ancestor of commit Y. Equivalently, you could say
@@ -793,7 +793,7 @@ e05db0fd4f31dde7005f075a84f96b360d05984b
793
-------------------------------------------------
794
795
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
797
both; so
798
799
-------------------------------------------------
@@ -820,7 +820,7 @@ You could just visually inspect the commits since e05db0fd:
820
$ gitk e05db0fd..
821
-------------------------------------------------
822
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
824
name based on any tag it finds pointing to one of the commit's
825
descendants:
826
@@ -864,8 +864,8 @@ because it outputs only commits that are not reachable from v1.5.0-rc1.
864
865
As yet another alternative, the linkgit:git-show-branch[1] command lists
866
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
869
870
-------------------------------------------------
871
$ git show-branch e05db0fd v1.5.0-rc0 v1.5.0-rc1 v1.5.0-rc2
@@ -877,15 +877,15 @@ available
877
...
878
-------------------------------------------------
879
880
-then search for a line that looks like
880
+then a line like
881
882
-------------------------------------------------
883
+ ++ [e05db0fd] Fix warnings in sha1_file.c - use C99 printf format if
884
available
885
-------------------------------------------------
886
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.
889
890
[[showing-commits-unique-to-a-branch]]
891
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
3542
manually check them out; earlier versions won't recognize the submodules at
3543
all.
3544
3545
-To see how submodule support works, create (for example) four example
3545
+To see how submodule support works, create four example
3546
repositories that can be used later as a submodule:
3547
3548
-------------------------------------------------
@@ -3914,7 +3914,7 @@ fact that such a commit brings together ("merges") two or more
3914
previous states represented by other commits.
3915
3916
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,
3918
and explains how we got there.
3919
3920
You create a commit object by giving it the tree that describes the