git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 05/11] Fix some typos and improve wording

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 27, 2013, 19:07 UTC
Message-ID
<xmqqk3j7c5ps.fsf@gitster.dls.corp.google.com>
In-Reply-To
<70864071.34489.1377626361141.JavaMail.ngmail@webmail19.arcor-online.net>
Thomas Ackermann <th.acker@arcor.de> writes:
Show 33 quoted lines
> 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.
Previous: Thomas AckermannNext: Junio C Hamano
Message 15 of 28 in “Modernize user-manual”
  1. 0/11 Modernize user-manualThomas Ackermann, Aug 27, 2013
  2. 01/11 Call it "Git User Manual" and remove reference to very old Git versionThomas Ackermann, Aug 27, 2013
  3. Junio C HamanoAug 27, 2013
  4. Lars Gullik BjønnesAug 27, 2013
  5. Junio C HamanoAug 29, 2013
  6. 02/11 Use current "detached HEAD" messageThomas Ackermann, Aug 27, 2013
  7. Junio C HamanoAug 29, 2013
  8. 03/11 Use current output for "git repack"Thomas Ackermann, Aug 27, 2013
  9. Junio C HamanoAug 29, 2013
  10. 04/11 Use "git merge" instead of "git pull ."Thomas Ackermann, Aug 27, 2013
  11. Junio C HamanoAug 27, 2013
  12. Jonathan NiederAug 27, 2013
  13. Junio C HamanoAug 27, 2013
  14. 05/11 Fix some typos and improve wordingThomas Ackermann, Aug 27, 2013
  15. Junio C HamanoAug 27, 2013
  16. Junio C HamanoAug 29, 2013
  17. 06/11 Simplify "How to make a commit"Thomas Ackermann, Aug 27, 2013
  18. Junio C HamanoAug 27, 2013
  19. Junio C HamanoAug 29, 2013
  20. 07/11 Improve section "Manipulating branches"Thomas Ackermann, Aug 27, 2013
  21. Junio C HamanoAug 27, 2013
  22. 08/11 Improve section "Merging multiple trees"Thomas Ackermann, Aug 27, 2013
  23. Junio C HamanoAug 27, 2013
  24. 09/11 Remove unnecessary historical note from "Object storage format"Thomas Ackermann, Aug 27, 2013
  25. Junio C HamanoAug 27, 2013
  26. 10/11 Remove irrelevant reference from "Tying it all together"Thomas Ackermann, Aug 27, 2013
  27. 11/11 "git prune" is safeThomas Ackermann, Aug 27, 2013
  28. Junio C HamanoAug 27, 2013

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.