Thomas Ackermann <th.acker@xxxxxxxx> writes: > Signed-off-by: Thomas Ackermann <th.acker@xxxxxxxx> > --- > Documentation/user-manual.txt | 20 ++++++++++---------- > 1 file changed, 10 insertions(+), 10 deletions(-) > > diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt > index 6241a43..465d9cb 100644 > --- a/Documentation/user-manual.txt > +++ b/Documentation/user-manual.txt > @@ -219,7 +219,7 @@ of development leading to that point. > > The best way to see how this works is using the linkgit:gitk[1] > command; running gitk now on a Git repository and looking for merge > -commits will help understand how the Git organizes history. > +commits will help understand how Git organizes history. > > In the following, we say that commit X is "reachable" from commit Y > if commit X is an ancestor of commit Y. Equivalently, you could say > @@ -793,7 +793,7 @@ e05db0fd4f31dde7005f075a84f96b360d05984b > ------------------------------------------------- > > Or you could recall that the `...` operator selects all commits > -contained reachable from either one reference or the other but not > +reachable from either one reference or the other but not > both; so > > ------------------------------------------------- > @@ -820,7 +820,7 @@ You could just visually inspect the commits since e05db0fd: > $ gitk e05db0fd.. > ------------------------------------------------- > > -Or you can use linkgit:git-name-rev[1], which will give the commit a > +or you can use linkgit:git-name-rev[1], which will give the commit a As raised during the initial review, the previous sentence has ended and this begins a new sentence, I think, hence "Or", not "or". > name based on any tag it finds pointing to one of the commit's > descendants: > > @@ -864,8 +864,8 @@ because it outputs only commits that are not reachable from v1.5.0-rc1. > > As yet another alternative, the linkgit:git-show-branch[1] command lists > the commits reachable from its arguments with a display on the left-hand > -side that indicates which arguments that commit is reachable from. So, > -you can run something like > +side that indicates which arguments that commit is reachable from. > +So, if you run something like > ------------------------------------------------- > $ git show-branch e05db0fd v1.5.0-rc0 v1.5.0-rc1 v1.5.0-rc2 > @@ -877,15 +877,15 @@ available > ... > ------------------------------------------------- > > -then search for a line that looks like > +then a line like > > ------------------------------------------------- > + ++ [e05db0fd] Fix warnings in sha1_file.c - use C99 printf format if > available > ------------------------------------------------- > > -Which shows that e05db0fd is reachable from itself, from v1.5.0-rc1, and > -from v1.5.0-rc2, but not from v1.5.0-rc0. > +shows that e05db0fd is reachable from itself, from v1.5.0-rc1, > +and from v1.5.0-rc2, and not from v1.5.0-rc0. This is easier to read. Good. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html