All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Thomas Ackermann <th.acker@arcor.de>
Cc: git@vger.kernel.org, martinvonz@gmail.com, jrnieder@gmail.com,
	wking@tremily.us, philipoakley@iee.org
Subject: Re: [PATCH 05/11] Fix some typos and improve wording
Date: Tue, 27 Aug 2013 12:07:59 -0700	[thread overview]
Message-ID: <xmqqk3j7c5ps.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <70864071.34489.1377626361141.JavaMail.ngmail@webmail19.arcor-online.net> (Thomas Ackermann's message of "Tue, 27 Aug 2013 19:59:21 +0200 (CEST)")

Thomas Ackermann <th.acker@arcor.de> writes:

> Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
> ---
>  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

I think I agree with Jonathan that this reads better with "Or", not
"or".

Other than that looks good to me.  Thanks.

  reply	other threads:[~2013-08-27 19:08 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-27 17:52 [PATCH v2 0/11] Modernize user-manual Thomas Ackermann
2013-08-27 17:55 ` [PATCH 01/11] Call it "Git User Manual" and remove reference to very old Git version Thomas Ackermann
2013-08-27 19:04   ` Junio C Hamano
2013-08-27 21:16     ` Lars Gullik Bjønnes
2013-08-29 18:12   ` Junio C Hamano
2013-08-27 17:56 ` [PATCH 02/11] Use current "detached HEAD" message Thomas Ackermann
2013-08-29 18:13   ` Junio C Hamano
2013-08-27 17:56 ` [PATCH 03/11] Use current output for "git repack" Thomas Ackermann
2013-08-29 18:13   ` Junio C Hamano
2013-08-27 17:58 ` [PATCH 04/11] Use "git merge" instead of "git pull ." Thomas Ackermann
2013-08-27 19:06   ` Junio C Hamano
2013-08-27 19:44     ` Jonathan Nieder
2013-08-27 20:46       ` Junio C Hamano
2013-08-27 17:59 ` [PATCH 05/11] Fix some typos and improve wording Thomas Ackermann
2013-08-27 19:07   ` Junio C Hamano [this message]
2013-08-29 18:16   ` Junio C Hamano
2013-08-27 18:01 ` [PATCH 06/11] Simplify "How to make a commit" Thomas Ackermann
2013-08-27 19:08   ` Junio C Hamano
2013-08-29 18:16   ` Junio C Hamano
2013-08-27 18:02 ` [PATCH 07/11] Improve section "Manipulating branches" Thomas Ackermann
2013-08-27 19:11   ` Junio C Hamano
2013-08-27 18:03 ` [PATCH 08/11] Improve section "Merging multiple trees" Thomas Ackermann
2013-08-27 19:15   ` Junio C Hamano
2013-08-27 18:04 ` [PATCH 09/11] Remove unnecessary historical note from "Object storage format" Thomas Ackermann
2013-08-27 19:16   ` Junio C Hamano
2013-08-27 18:04 ` [PATCH 10/11] Remove irrelevant reference from "Tying it all together" Thomas Ackermann
2013-08-27 18:05 ` [PATCH 11/11] "git prune" is safe Thomas Ackermann
2013-08-27 19:17   ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqk3j7c5ps.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=jrnieder@gmail.com \
    --cc=martinvonz@gmail.com \
    --cc=philipoakley@iee.org \
    --cc=th.acker@arcor.de \
    --cc=wking@tremily.us \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.