From: Junio C Hamano <gitster@pobox.com>
To: "Martin Ågren" <martin.agren@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] RelNotes/2.23.0: fix a few typos and other minor issues
Date: Thu, 01 Aug 2019 08:56:30 -0700 [thread overview]
Message-ID: <xmqqa7csop5d.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20190801141221.3626-1-martin.agren@gmail.com> ("Martin Ågren"'s message of "Thu, 1 Aug 2019 16:12:20 +0200")
Martin Ågren <martin.agren@gmail.com> writes:
> Fix the spelling of the new "--no-show-forced-updates" option that "git
> fetch/pull" learned. Similarly, spell "--function-context" correctly and
> fix a few typos, grammos and minor mistakes.
>
> One of these is also in 2.22.1.txt, so fix it there too.
>
> Signed-off-by: Martin Ågren <martin.agren@gmail.com>
Thanks.
> ---
> Documentation/RelNotes/2.22.1.txt | 2 +-
> Documentation/RelNotes/2.23.0.txt | 14 +++++++-------
> 2 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/Documentation/RelNotes/2.22.1.txt b/Documentation/RelNotes/2.22.1.txt
> index 78b2c5ea8a..76dd8fb578 100644
> --- a/Documentation/RelNotes/2.22.1.txt
> +++ b/Documentation/RelNotes/2.22.1.txt
> @@ -94,7 +94,7 @@ Fixes since v2.22
>
> * The configuration variable rebase.rescheduleFailedExec should be
> effective only while running an interactive rebase and should not
> - affect anything when running an non-interactive one, which was not
> + affect anything when running a non-interactive one, which was not
> the case. This has been corrected.
>
> * "git submodule foreach" did not protect command line options passed
> diff --git a/Documentation/RelNotes/2.23.0.txt b/Documentation/RelNotes/2.23.0.txt
> index 19e894a44e..e1b1ce5680 100644
> --- a/Documentation/RelNotes/2.23.0.txt
> +++ b/Documentation/RelNotes/2.23.0.txt
> @@ -52,7 +52,7 @@ UI, Workflows & Features
>
> * "git fetch" and "git pull" reports when a fetch results in
> non-fast-forward updates to let the user notice unusual situation.
> - The commands learned "--no-shown-forced-updates" option to disable
> + The commands learned "--no-show-forced-updates" option to disable
> this safety feature.
>
> * Two new commands "git switch" and "git restore" are introduced to
> @@ -68,7 +68,7 @@ UI, Workflows & Features
> * The conditional inclusion mechanism learned to base the choice on
> the branch the HEAD currently is on.
>
> - * "git rev-list --objects" learned with "--no-object-names" option to
> + * "git rev-list --objects" learned the "--no-object-names" option to
> squelch the path to the object that is used as a grouping hint for
> pack-objects.
>
> @@ -106,7 +106,7 @@ Performance, Internal Implementation, Development Support etc.
> no longer be used.
>
> * Developer support to emulate unsatisfied prerequisites in tests to
> - ensure that the remainer of the tests still succeeds when tests
> + ensure that the remainder of the tests still succeeds when tests
> with prerequisites are skipped.
>
> * "git update-server-info" learned not to rewrite the file with the
> @@ -121,7 +121,7 @@ Performance, Internal Implementation, Development Support etc.
> * Prepare use of reachability index in topological walker that works
> on a range (A..B).
>
> - * A new tutorial targetting specifically aspiring git-core
> + * A new tutorial targeting specifically aspiring git-core
> developers has been added.
>
> * Auto-detect how to tell HP-UX aCC where to use dynamically linked
> @@ -181,7 +181,7 @@ Fixes since v2.22
> the same repository was corrupt, which has been corrected.
>
> * The ownership rule for the file descriptor to fast-import remote
> - backend was mixed up, leading to unrelated file descriptor getting
> + backend was mixed up, leading to an unrelated file descriptor getting
> closed, which has been fixed.
>
> * A "merge -c" instruction during "git rebase --rebase-merges" should
> @@ -306,7 +306,7 @@ Fixes since v2.22
>
> * The configuration variable rebase.rescheduleFailedExec should be
> effective only while running an interactive rebase and should not
> - affect anything when running an non-interactive one, which was not
> + affect anything when running a non-interactive one, which was not
> the case. This has been corrected.
>
> * The "git clone" documentation refers to command line options in its
> @@ -339,7 +339,7 @@ Fixes since v2.22
> having to consult the other end, which has been corrected.
>
> * The internal diff machinery can be made to read out of bounds while
> - looking for --funcion-context line in a corner case, which has been
> + looking for --function-context line in a corner case, which has been
> corrected.
> (merge b777f3fd61 jk/xdiff-clamp-funcname-context-index later to maint).
next prev parent reply other threads:[~2019-08-01 15:58 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-29 21:49 [ANNOUNCE] Git v2.23.0-rc0 Junio C Hamano
2019-07-31 12:43 ` Git for Windows v2.23.0-rc0, was " Johannes Schindelin
2019-07-31 23:18 ` Jeff King
2019-08-01 0:21 ` Jonathan Nieder
2019-08-01 0:37 ` Ariadne Conill
2019-08-01 1:00 ` Jeff King
2019-08-01 1:14 ` Jonathan Nieder
2019-08-01 1:38 ` Ariadne Conill
2019-08-01 2:53 ` Jeff King
2019-08-01 3:21 ` Junio C Hamano
2019-08-01 4:54 ` Ariadne Conill
2019-08-01 21:39 ` Johannes Schindelin
2019-08-01 15:45 ` Junio C Hamano
2019-08-01 16:12 ` Ariadne Conill
2019-08-01 21:36 ` Jeff King
2019-08-01 21:46 ` Junio C Hamano
2019-08-01 21:54 ` Junio C Hamano
2019-08-01 22:18 ` Todd Zullinger
2019-08-02 2:27 ` Jonathan Nieder
2019-08-02 16:53 ` Junio C Hamano
2019-08-02 18:35 ` Jeff King
2019-08-01 1:04 ` [git-for-windows] " Bryan Turner
2019-08-01 21:40 ` Johannes Schindelin
2019-08-01 14:12 ` [PATCH] RelNotes/2.23.0: fix a few typos and other minor issues Martin Ågren
2019-08-01 15:56 ` Junio C Hamano [this message]
2019-08-01 15:57 ` Junio C Hamano
2019-08-01 19:28 ` Martin Ågren
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqa7csop5d.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=martin.agren@gmail.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).