Skip to content

Commit

Permalink
RelNotes/2.0.0.txt: Fix several grammar issues, notably a lack of hyp…
Browse files Browse the repository at this point in the history
…hens, double quotes, or articles

Signed-off-by: Jason St. John <jstjohn@purdue.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Jason St. John authored and Junio C Hamano committed May 20, 2014
1 parent b2c851a commit 3054c66
Showing 1 changed file with 37 additions and 36 deletions.
73 changes: 37 additions & 36 deletions Documentation/RelNotes/2.0.0.txt
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ with "git diff-files --diff-filter=d").
The default prefix for "git svn" has changed in Git 2.0. For a long
time, "git svn" created its remote-tracking branches directly under
refs/remotes, but it now places them under refs/remotes/origin/ unless
it is told otherwise with its --prefix option.
it is told otherwise with its "--prefix" option.


Updates since v1.9 series
Expand All @@ -53,7 +53,7 @@ Updates since v1.9 series
UI, Workflows & Features

* The "multi-mail" post-receive hook (in contrib/) has been updated
to a more recent version from the upstream.
to a more recent version from upstream.

* The "remote-hg/bzr" remote-helper interfaces (in contrib/) are
now maintained separately as a third-party plug-in.
Expand All @@ -66,12 +66,13 @@ UI, Workflows & Features
single strand-of-pearls is broken in its output.

* The "rev-parse --parseopt" mechanism used by scripted Porcelains to
parse command line options and to give help text learned to take
parse command-line options and to give help text learned to take
the argv-help (the placeholder string for an option parameter,
e.g. "key-id" in "--gpg-sign=<key-id>").

* The pattern to find where the function begins in C/C++ used in
"diff" and "grep -p" has been updated to help C++ source better.
"diff" and "grep -p" has been updated to improve viewing C++
sources.

* "git rebase" learned to interpret a lone "-" as "@{-1}", the
branch that we were previously on.
Expand All @@ -82,7 +83,7 @@ UI, Workflows & Features
"--sort=version:refname".

* Discard the accumulated "heuristics" to guess from which branch the
result wants to be pulled from and make sure what the end user
result wants to be pulled from and make sure that what the end user
specified is not second-guessed by "git request-pull", to avoid
mistakes. When you pushed out your 'master' branch to your public
repository as 'for-linus', use the new "master:for-linus" syntax to
Expand Down Expand Up @@ -117,28 +118,28 @@ UI, Workflows & Features
* The progress indicators from various time-consuming commands have
been marked for i18n/l10n.

* "git notes -C <blob>" diagnoses an attempt to use an object that
is not a blob as an error.
* "git notes -C <blob>" diagnoses as an error an attempt to use an
object that is not a blob.

* "git config" learned to read from the standard input when "-" is
given as the value to its "--file" parameter (attempting an
operation to update the configuration in the standard input of
course is rejected).
operation to update the configuration in the standard input is
rejected, of course).

* Trailing whitespaces in .gitignore files, unless they are quoted
for fnmatch(3), e.g. "path\ ", are warned and ignored. Strictly
speaking, this is a backward incompatible change, but very unlikely
speaking, this is a backward-incompatible change, but very unlikely
to bite any sane user and adjusting should be obvious and easy.

* Many commands that create commits, e.g. "pull", "rebase",
learned to take the --gpg-sign option on the command line.
* Many commands that create commits, e.g. "pull" and "rebase",
learned to take the "--gpg-sign" option on the command line.

* "git commit" can be told to always GPG sign the resulting commit
by setting "commit.gpgsign" configuration variable to true (the
command line option --no-gpg-sign should override it).
by setting the "commit.gpgsign" configuration variable to "true"
(the command-line option "--no-gpg-sign" should override it).

* "git pull" can be told to only accept fast-forward by setting the
new "pull.ff" configuration.
new "pull.ff" configuration variable.

* "git reset" learned the "-N" option, which does not reset the index
fully for paths the index knows about but the tree-ish the command
Expand All @@ -155,7 +156,7 @@ Performance, Internal Implementation, etc.

* Uses of curl's "multi" interface and "easy" interface do not mix
well when we attempt to reuse outgoing connections. Teach the RPC
over http code, used in the smart HTTP transport, not to use the
over HTTP code, used in the smart HTTP transport, not to use the
"easy" interface.

* The bitmap-index feature from JGit has been ported, which should
Expand Down Expand Up @@ -193,20 +194,20 @@ notes for details).

* The remote-helper interface to fast-import/fast-export via the
transport-helper has been tightened to avoid leaving the import
marks file from a failed/crashed run, as such a file that is out of
sync with the reality confuses a later invocation of itself.
marks file from a failed/crashed run, as such a file that is out-of-
sync with reality confuses a later invocation of itself.

* "git rebase" used a POSIX shell construct FreeBSD /bin/sh does not
* "git rebase" used a POSIX shell construct FreeBSD's /bin/sh does not
work well with.
(merge 8cd6596 km/avoid-non-function-return-in-rebase later to maint).

* zsh prompt (in contrib/) leaked unnecessary error messages.

* bash completion (in contrib/) did not complete the refs and remotes
* Bash completion (in contrib/) did not complete the refs and remotes
correctly given "git pu<TAB>" when "pu" is aliased to "push".

* Some more Unicode codepoints defined in Unicode 6.3 as having zero
width have been taught to our display column counting logic.
* Some more Unicode code points, defined in Unicode 6.3 as having zero
width, have been taught to our display column counting logic.
(merge d813ab9 tb/unicode-6.3-zero-width later to maint).

* Some tests used shell constructs that did not work well on FreeBSD
Expand All @@ -220,7 +221,7 @@ notes for details).
* "git diff --no-index -Mq a b" fell into an infinite loop.
(merge ad1c3fb jc/fix-diff-no-index-diff-opt-parse later to maint).

* "git fetch --prune", when the right-hand-side of multiple fetch
* "git fetch --prune", when the right-hand side of multiple fetch
refspecs overlap (e.g. storing "refs/heads/*" to
"refs/remotes/origin/*", while storing "refs/frotz/*" to
"refs/remotes/origin/fr/*"), aggressively thought that lack of
Expand Down Expand Up @@ -275,7 +276,7 @@ notes for details).
(merge 3c3e6f5 rr/doc-merge-strategies later to maint).

* Serving objects from a shallow repository needs to write a
new file to hold the temporary shallow boundaries but it was not
new file to hold the temporary shallow boundaries, but it was not
cleaned when we exit due to die() or a signal.
(merge 7839632 jk/shallow-update-fix later to maint).

Expand All @@ -298,19 +299,19 @@ notes for details).
".git" tells us where it is.
(merge fcfec8b da/difftool-git-files later to maint).

* "git push" did not pay attention to branch.*.pushremote if it is
defined earlier than remote.pushdefault; the order of these two
* "git push" did not pay attention to "branch.*.pushremote" if it is
defined earlier than "remote.pushdefault"; the order of these two
variables in the configuration file should not matter, but it did
by mistake.
(merge 98b406f jk/remote-pushremote-config-reading later to maint).

* Codepaths that parse timestamps in commit objects have been
* Code paths that parse timestamps in commit objects have been
tightened.
(merge f80d1f9 jk/commit-dates-parsing-fix later to maint).

* "git diff --external-diff" incorrectly fed the submodule directory
in the working tree to the external diff driver when it knew it is
the same as one of the versions being compared.
in the working tree to the external diff driver when it knew that it
is the same as one of the versions being compared.
(merge aba4727 tr/diff-submodule-no-reuse-worktree later to maint).

* "git reset" needs to refresh the index when working in a working
Expand All @@ -321,20 +322,20 @@ notes for details).

* "git check-attr" when working on a repository with a working tree
did not work well when the working tree was specified via the
--work-tree (and obviously with --git-dir) option.
"--work-tree" (and obviously with "--git-dir") option.
(merge cdbf623 jc/check-attr-honor-working-tree later to maint).

* "merge-recursive" was broken in 1.7.7 era and stopped working in
an empty (temporary) working tree, when there are renames
involved. This has been corrected.
(merge 6e2068a bk/refresh-missing-ok-in-merge-recursive later to maint.)

* "git rev-parse" was loose in rejecting command line arguments
* "git rev-parse" was loose in rejecting command-line arguments
that do not make sense, e.g. "--default" without the required
value for that option.
(merge a43219f ds/rev-parse-required-args later to maint.)

* include.path variable (or any variable that expects a path that
* "include.path" variable (or any variable that expects a path that
can use ~username expansion) in the configuration file is not a
boolean, but the code failed to check it.
(merge 67beb60 jk/config-path-include-fix later to maint.)
Expand All @@ -346,20 +347,20 @@ notes for details).
(merge later 655ee9e mw/symlinks to maint.)

* "git diff --quiet -- pathspec1 pathspec2" sometimes did not return
correct status value.
the correct status value.
(merge f34b205 nd/diff-quiet-stat-dirty later to maint.)

* Attempting to deepen a shallow repository by fetching over smart
HTTP transport failed in the protocol exchange, when no-done
HTTP transport failed in the protocol exchange, when the no-done
extension was used. The fetching side waited for the list of
shallow boundary commits after the sending end stopped talking to
shallow boundary commits after the sending side stopped talking to
it.
(merge 0232852 nd/http-fetch-shallow-fix later to maint.)

* Allow "git cmd path/", when the 'path' is where a submodule is
bound to the top-level working tree, to match 'path', despite the
extra and unnecessary trailing slash (such a slash is often
given by command line completion).
given by command-line completion).
(merge 2e70c01 nd/submodule-pathspec-ending-with-slash later to maint.)

* Documentation and in-code comments had many instances of mistaken
Expand Down

0 comments on commit 3054c66

Please sign in to comment.