treewide: correct several "up-to-date" to "up to date"
Follow the Oxford style, which says to use "up-to-date" before the noun, but "up to date" after it. Don't change plumbing (specifically send-pack.c, but transport.c (git push) also has the same string). This was produced by grepping for "up-to-date" and "up to date". It turned out we only had to edit in one direction, removing the hyphens. Fix a typo in Documentation/git-diff-index.txt while we're there. Reported-by: Jeffrey Manian <jeffrey.manian@gmail.com> Reported-by: STEVEN WHITE <stevencharleswhitevoices@gmail.com> Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
3c82eec8fb
commit
7560f547e6
@ -66,7 +66,7 @@ OPTIONS
|
||||
disables it is in effect), make sure the patch is
|
||||
applicable to what the current index file records. If
|
||||
the file to be patched in the working tree is not
|
||||
up-to-date, it is flagged as an error. This flag also
|
||||
up to date, it is flagged as an error. This flag also
|
||||
causes the index file to be updated.
|
||||
|
||||
--cached::
|
||||
@ -259,7 +259,7 @@ treats these changes as follows.
|
||||
If `--index` is specified (explicitly or implicitly), then the submodule
|
||||
commits must match the index exactly for the patch to apply. If any
|
||||
of the submodules are checked-out, then these check-outs are completely
|
||||
ignored, i.e., they are not required to be up-to-date or clean and they
|
||||
ignored, i.e., they are not required to be up to date or clean and they
|
||||
are not updated.
|
||||
|
||||
If `--index` is not specified, then the submodule commits in the patch
|
||||
|
@ -223,7 +223,7 @@ access method and requested operation.
|
||||
That means that even if you offer only read access (e.g. by using
|
||||
the pserver method), 'git-cvsserver' should have write access to
|
||||
the database to work reliably (otherwise you need to make sure
|
||||
that the database is up-to-date any time 'git-cvsserver' is executed).
|
||||
that the database is up to date any time 'git-cvsserver' is executed).
|
||||
|
||||
By default it uses SQLite databases in the Git directory, named
|
||||
`gitcvs.<module_name>.sqlite`. Note that the SQLite backend creates
|
||||
|
@ -85,7 +85,7 @@ a 'git write-tree' + 'git diff-tree'. Thus that's the default mode.
|
||||
The non-cached version asks the question:
|
||||
|
||||
show me the differences between HEAD and the currently checked out
|
||||
tree - index contents _and_ files that aren't up-to-date
|
||||
tree - index contents _and_ files that aren't up to date
|
||||
|
||||
which is obviously a very useful question too, since that tells you what
|
||||
you *could* commit. Again, the output matches the 'git diff-tree -r'
|
||||
@ -100,8 +100,8 @@ have not actually done a 'git update-index' on it yet - there is no
|
||||
torvalds@ppc970:~/v2.6/linux> git diff-index --abbrev HEAD
|
||||
:100644 100664 7476bb... 000000... kernel/sched.c
|
||||
|
||||
i.e., it shows that the tree has changed, and that `kernel/sched.c` has is
|
||||
not up-to-date and may contain new stuff. The all-zero sha1 means that to
|
||||
i.e., it shows that the tree has changed, and that `kernel/sched.c` is
|
||||
not up to date and may contain new stuff. The all-zero sha1 means that to
|
||||
get the real diff, you need to look at the object in the working directory
|
||||
directly rather than do an object-to-object diff.
|
||||
|
||||
|
@ -133,7 +133,7 @@ exception is when the changed index entries are in the state that
|
||||
would result from the merge already.)
|
||||
|
||||
If all named commits are already ancestors of `HEAD`, 'git merge'
|
||||
will exit early with the message "Already up-to-date."
|
||||
will exit early with the message "Already up to date."
|
||||
|
||||
FAST-FORWARD MERGE
|
||||
------------------
|
||||
|
@ -334,7 +334,7 @@ which makes little sense.
|
||||
|
||||
-f::
|
||||
--force-rebase::
|
||||
Force a rebase even if the current branch is up-to-date and
|
||||
Force a rebase even if the current branch is up to date and
|
||||
the command without `--force` would return without doing anything.
|
||||
+
|
||||
You may find this (or --no-ff with an interactive rebase) helpful after
|
||||
|
@ -205,7 +205,7 @@ development on the topic branch:
|
||||
------------
|
||||
|
||||
you could run `git rebase master topic`, to bring yourself
|
||||
up-to-date before your topic is ready to be sent upstream.
|
||||
up to date before your topic is ready to be sent upstream.
|
||||
This would result in falling back to a three-way merge, and it
|
||||
would conflict the same way as the test merge you resolved earlier.
|
||||
'git rerere' will be run by 'git rebase' to help you resolve this
|
||||
|
@ -146,7 +146,7 @@ the submodule's history. If it exists the submodule.<name> section
|
||||
in the linkgit:gitmodules[5] file will also be removed and that file
|
||||
will be staged (unless --cached or -n are used).
|
||||
|
||||
A submodule is considered up-to-date when the HEAD is the same as
|
||||
A submodule is considered up to date when the HEAD is the same as
|
||||
recorded in the index, no tracked files are modified and no untracked
|
||||
files that aren't ignored are present in the submodules work tree.
|
||||
Ignored files are deemed expendable and won't stop a submodule's work
|
||||
|
@ -424,7 +424,7 @@ Any other arguments are passed directly to 'git log'
|
||||
'set-tree'::
|
||||
You should consider using 'dcommit' instead of this command.
|
||||
Commit specified commit or tree objects to SVN. This relies on
|
||||
your imported fetch data being up-to-date. This makes
|
||||
your imported fetch data being up to date. This makes
|
||||
absolutely no attempts to do patching when committing to SVN, it
|
||||
simply overwrites files with those specified in the tree or
|
||||
commit. All merging is assumed to have taken place
|
||||
|
@ -214,7 +214,7 @@ will remove the intended effect of the option.
|
||||
Using --refresh
|
||||
---------------
|
||||
`--refresh` does not calculate a new sha1 file or bring the index
|
||||
up-to-date for mode/content changes. But what it *does* do is to
|
||||
up to date for mode/content changes. But what it *does* do is to
|
||||
"re-match" the stat information of a file with the index, so that you
|
||||
can refresh the index for a file that hasn't been changed but where
|
||||
the stat entry is out of date.
|
||||
|
@ -631,7 +631,7 @@ So after you do a `cp -a` to create a new copy, you'll want to do
|
||||
$ git update-index --refresh
|
||||
----------------
|
||||
+
|
||||
in the new repository to make sure that the index file is up-to-date.
|
||||
in the new repository to make sure that the index file is up to date.
|
||||
|
||||
Note that the second point is true even across machines. You can
|
||||
duplicate a remote Git repository with *any* regular copy mechanism, be it
|
||||
@ -701,7 +701,7 @@ $ git checkout-index -u -a
|
||||
----------------
|
||||
|
||||
where the `-u` flag means that you want the checkout to keep the index
|
||||
up-to-date (so that you don't have to refresh it afterward), and the
|
||||
up to date (so that you don't have to refresh it afterward), and the
|
||||
`-a` flag means "check out all files" (if you have a stale copy or an
|
||||
older version of a checked out tree you may also need to add the `-f`
|
||||
flag first, to tell 'git checkout-index' to *force* overwriting of any old
|
||||
@ -1283,7 +1283,7 @@ run a single command, 'git-receive-pack'.
|
||||
|
||||
First, you need to create an empty repository on the remote
|
||||
machine that will house your public repository. This empty
|
||||
repository will be populated and be kept up-to-date by pushing
|
||||
repository will be populated and be kept up to date by pushing
|
||||
into it later. Obviously, this repository creation needs to be
|
||||
done only once.
|
||||
|
||||
@ -1450,7 +1450,7 @@ transport protocols (HTTP), you need to keep this repository
|
||||
would contain a call to 'git update-server-info'
|
||||
but you need to manually enable the hook with
|
||||
`mv post-update.sample post-update`. This makes sure
|
||||
'git update-server-info' keeps the necessary files up-to-date.
|
||||
'git update-server-info' keeps the necessary files up to date.
|
||||
|
||||
3. Push into the public repository from your primary
|
||||
repository.
|
||||
|
@ -369,7 +369,7 @@ them.
|
||||
|
||||
When enabled, the default 'post-update' hook runs
|
||||
'git update-server-info' to keep the information used by dumb
|
||||
transports (e.g., HTTP) up-to-date. If you are publishing
|
||||
transports (e.g., HTTP) up to date. If you are publishing
|
||||
a Git repository that is accessible via HTTP, you should
|
||||
probably enable this hook.
|
||||
|
||||
|
@ -71,7 +71,7 @@ objects/info/packs::
|
||||
This file is to help dumb transports discover what packs
|
||||
are available in this object store. Whenever a pack is
|
||||
added or removed, `git update-server-info` should be run
|
||||
to keep this file up-to-date if the repository is
|
||||
to keep this file up to date if the repository is
|
||||
published for dumb transports. 'git repack' does this
|
||||
by default.
|
||||
|
||||
|
@ -109,7 +109,7 @@ summary of the situation with 'git status':
|
||||
$ git status
|
||||
On branch master
|
||||
Changes to be committed:
|
||||
Your branch is up-to-date with 'origin/master'.
|
||||
Your branch is up to date with 'origin/master'.
|
||||
(use "git reset HEAD <file>..." to unstage)
|
||||
|
||||
modified: file1
|
||||
|
@ -39,7 +39,7 @@ set to `no` at the beginning of them.
|
||||
|
||||
--ff-only::
|
||||
Refuse to merge and exit with a non-zero status unless the
|
||||
current `HEAD` is already up-to-date or the merge can be
|
||||
current `HEAD` is already up to date or the merge can be
|
||||
resolved as a fast-forward.
|
||||
|
||||
--log[=<n>]::
|
||||
|
@ -199,7 +199,7 @@ After reference and capabilities discovery, the client can decide to
|
||||
terminate the connection by sending a flush-pkt, telling the server it can
|
||||
now gracefully terminate, and disconnect, when it does not need any pack
|
||||
data. This can happen with the ls-remote command, and also can happen when
|
||||
the client already is up-to-date.
|
||||
the client already is up to date.
|
||||
|
||||
Otherwise, it enters the negotiation phase, where the client and
|
||||
server determine what the minimal packfile necessary for transport is,
|
||||
|
@ -32,7 +32,7 @@ or the result.
|
||||
If multiple cases apply, the one used is listed first.
|
||||
|
||||
A result which changes the index is an error if the index is not empty
|
||||
and not up-to-date.
|
||||
and not up to date.
|
||||
|
||||
Entries marked '+' have stat information. Spaces marked '*' don't
|
||||
affect the result.
|
||||
@ -65,7 +65,7 @@ empty, no entry is left for that stage). Otherwise, the given entry is
|
||||
left in stage 0, and there are no other entries.
|
||||
|
||||
A result of "no merge" is an error if the index is not empty and not
|
||||
up-to-date.
|
||||
up to date.
|
||||
|
||||
*empty* means that the tree must not have a directory-file conflict
|
||||
with the entry.
|
||||
|
@ -2195,7 +2195,7 @@ $ cd work
|
||||
Linus's tree will be stored in the remote-tracking branch named origin/master,
|
||||
and can be updated using linkgit:git-fetch[1]; you can track other
|
||||
public trees using linkgit:git-remote[1] to set up a "remote" and
|
||||
linkgit:git-fetch[1] to keep them up-to-date; see
|
||||
linkgit:git-fetch[1] to keep them up to date; see
|
||||
<<repositories-and-branches>>.
|
||||
|
||||
Now create the branches in which you are going to work; these start out
|
||||
|
Reference in New Issue
Block a user