git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Michael J Gruber <git@drmicha.warpmail.net>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH] RelNotes/1.7.5.txt: typo and language fixes
Date: Wed, 16 Mar 2011 10:23:23 +0100	[thread overview]
Message-ID: <aa605c2fe8bd57fdb9dc9f4876ba192e664e982d.1300267366.git.git@drmicha.warpmail.net> (raw)

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
---
Notes:
    to be applied now or squashed in with more substantial updates

 Documentation/RelNotes/1.7.5.txt |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Documentation/RelNotes/1.7.5.txt b/Documentation/RelNotes/1.7.5.txt
index 2c96f4d..2a80b03 100644
--- a/Documentation/RelNotes/1.7.5.txt
+++ b/Documentation/RelNotes/1.7.5.txt
@@ -25,11 +25,11 @@ Updates since v1.7.4
  * "git checkout --detach <commit>" is a more user friendly synonym for
    "git checkout <commit>^0".
 
- * "git checkout" performed on detached HEAD gives a warning and an
+ * "git checkout" performed on detached HEAD gives a warning and
    advice when the commit being left behind will become unreachable from
    any branch or tag.
 
- * "git cherry-pick" and "git revert" can be told to use custom merge
+ * "git cherry-pick" and "git revert" can be told to use a custom merge
    strategy, similar to "git rebase".
 
  * "git cherry-pick" remembers which commit failed to apply when it is
@@ -43,10 +43,10 @@ Updates since v1.7.4
  * "git grep --no-index" did not honor pathspecs correctly, returning
    paths outside the specified area.
 
- * "git log" family of commands now understand globbing pathspecs.  You
+ * "git log" type commands now understand globbing pathspecs.  You
    can say "git log -- '*.txt'" for example.
 
- * "git rev-list --objects $revs -- $pathspec" would limit the objects listed
+ * "git rev-list --objects $revs -- $pathspec" now limits the objects listed
    in its output properly with the pathspec, in preparation for narrow
    clones.
 
@@ -54,8 +54,8 @@ Updates since v1.7.4
    "tracking" is used as the push.default semantics or there is no remote
    configured yet.
 
- * "git rerere" learned a new subcommand "remaining", that is similar to
-   "status" that lists the paths that had conflicts that are known to
+ * "git rerere" learned a new subcommand "remaining" that is similar to
+   "status" and lists the paths that had conflicts which are known to
    rerere, but excludes the paths that have already been marked as
    resolved in the index from its output.  "git mergetool" has been
    updated to use this facility.
@@ -91,17 +91,17 @@ release, unless otherwise noted.
  * "git diff --stat -B" ran on binary files counted the changes in lines,
    which was nonsensical (jk/diffstat-binary).
 
- * "git diff -M" opportunisticly detected copies, which was not
+ * "git diff -M" opportunistically detected copies, which was not
    necessarily a good thing, especially when it is internally run by
    recursive merge.
 
- * "git merge" triggers prepare-commit-msg hook.  Earlier, only "git
+ * "git merge" now triggers the prepare-commit-msg hook.  Earlier, only "git
    commit" to conclude an interrupted merge triggered the hook, leading to
    an inconsistent overall user experience (js/maint-merge-use-prepare-commit-msg-hook).
 
- * "git submodule update" used to honor --merge/--rebase option (or
+ * "git submodule update" used to honor the --merge/--rebase option (or
    corresponding configuration variables) even for a newly cloned
-   subprojects, which made no sense (so/submodule-no-update-first-time).
+   subproject, which made no sense (so/submodule-no-update-first-time).
 
 ---
 exec >/var/tmp/1
-- 
1.7.4.1.404.g62d316

                 reply	other threads:[~2011-03-16  9:27 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=aa605c2fe8bd57fdb9dc9f4876ba192e664e982d.1300267366.git.git@drmicha.warpmail.net \
    --to=git@drmicha.warpmail.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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.
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 NNTP newsgroup(s).