Skip to content

Commit 7560f54

Browse files
Martin Ågrengitster
authored andcommitted
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 <[email protected]> Reported-by: STEVEN WHITE <[email protected]> Signed-off-by: Martin Ågren <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 3c82eec commit 7560f54

30 files changed

+40
-40
lines changed

Documentation/git-apply.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ OPTIONS
6666
disables it is in effect), make sure the patch is
6767
applicable to what the current index file records. If
6868
the file to be patched in the working tree is not
69-
up-to-date, it is flagged as an error. This flag also
69+
up to date, it is flagged as an error. This flag also
7070
causes the index file to be updated.
7171

7272
--cached::
@@ -259,7 +259,7 @@ treats these changes as follows.
259259
If `--index` is specified (explicitly or implicitly), then the submodule
260260
commits must match the index exactly for the patch to apply. If any
261261
of the submodules are checked-out, then these check-outs are completely
262-
ignored, i.e., they are not required to be up-to-date or clean and they
262+
ignored, i.e., they are not required to be up to date or clean and they
263263
are not updated.
264264

265265
If `--index` is not specified, then the submodule commits in the patch

Documentation/git-cvsserver.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ access method and requested operation.
223223
That means that even if you offer only read access (e.g. by using
224224
the pserver method), 'git-cvsserver' should have write access to
225225
the database to work reliably (otherwise you need to make sure
226-
that the database is up-to-date any time 'git-cvsserver' is executed).
226+
that the database is up to date any time 'git-cvsserver' is executed).
227227

228228
By default it uses SQLite databases in the Git directory, named
229229
`gitcvs.<module_name>.sqlite`. Note that the SQLite backend creates

Documentation/git-diff-index.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ a 'git write-tree' + 'git diff-tree'. Thus that's the default mode.
8585
The non-cached version asks the question:
8686

8787
show me the differences between HEAD and the currently checked out
88-
tree - index contents _and_ files that aren't up-to-date
88+
tree - index contents _and_ files that aren't up to date
8989

9090
which is obviously a very useful question too, since that tells you what
9191
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
100100
torvalds@ppc970:~/v2.6/linux> git diff-index --abbrev HEAD
101101
:100644 100664 7476bb... 000000... kernel/sched.c
102102

103-
i.e., it shows that the tree has changed, and that `kernel/sched.c` has is
104-
not up-to-date and may contain new stuff. The all-zero sha1 means that to
103+
i.e., it shows that the tree has changed, and that `kernel/sched.c` is
104+
not up to date and may contain new stuff. The all-zero sha1 means that to
105105
get the real diff, you need to look at the object in the working directory
106106
directly rather than do an object-to-object diff.
107107

Documentation/git-merge.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ exception is when the changed index entries are in the state that
133133
would result from the merge already.)
134134

135135
If all named commits are already ancestors of `HEAD`, 'git merge'
136-
will exit early with the message "Already up-to-date."
136+
will exit early with the message "Already up to date."
137137

138138
FAST-FORWARD MERGE
139139
------------------

Documentation/git-rebase.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ which makes little sense.
334334

335335
-f::
336336
--force-rebase::
337-
Force a rebase even if the current branch is up-to-date and
337+
Force a rebase even if the current branch is up to date and
338338
the command without `--force` would return without doing anything.
339339
+
340340
You may find this (or --no-ff with an interactive rebase) helpful after

Documentation/git-rerere.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ development on the topic branch:
205205
------------
206206

207207
you could run `git rebase master topic`, to bring yourself
208-
up-to-date before your topic is ready to be sent upstream.
208+
up to date before your topic is ready to be sent upstream.
209209
This would result in falling back to a three-way merge, and it
210210
would conflict the same way as the test merge you resolved earlier.
211211
'git rerere' will be run by 'git rebase' to help you resolve this

Documentation/git-rm.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ the submodule's history. If it exists the submodule.<name> section
146146
in the linkgit:gitmodules[5] file will also be removed and that file
147147
will be staged (unless --cached or -n are used).
148148

149-
A submodule is considered up-to-date when the HEAD is the same as
149+
A submodule is considered up to date when the HEAD is the same as
150150
recorded in the index, no tracked files are modified and no untracked
151151
files that aren't ignored are present in the submodules work tree.
152152
Ignored files are deemed expendable and won't stop a submodule's work

Documentation/git-svn.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ Any other arguments are passed directly to 'git log'
424424
'set-tree'::
425425
You should consider using 'dcommit' instead of this command.
426426
Commit specified commit or tree objects to SVN. This relies on
427-
your imported fetch data being up-to-date. This makes
427+
your imported fetch data being up to date. This makes
428428
absolutely no attempts to do patching when committing to SVN, it
429429
simply overwrites files with those specified in the tree or
430430
commit. All merging is assumed to have taken place

Documentation/git-update-index.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ will remove the intended effect of the option.
214214
Using --refresh
215215
---------------
216216
`--refresh` does not calculate a new sha1 file or bring the index
217-
up-to-date for mode/content changes. But what it *does* do is to
217+
up to date for mode/content changes. But what it *does* do is to
218218
"re-match" the stat information of a file with the index, so that you
219219
can refresh the index for a file that hasn't been changed but where
220220
the stat entry is out of date.

Documentation/gitcore-tutorial.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,7 @@ So after you do a `cp -a` to create a new copy, you'll want to do
631631
$ git update-index --refresh
632632
----------------
633633
+
634-
in the new repository to make sure that the index file is up-to-date.
634+
in the new repository to make sure that the index file is up to date.
635635

636636
Note that the second point is true even across machines. You can
637637
duplicate a remote Git repository with *any* regular copy mechanism, be it
@@ -701,7 +701,7 @@ $ git checkout-index -u -a
701701
----------------
702702

703703
where the `-u` flag means that you want the checkout to keep the index
704-
up-to-date (so that you don't have to refresh it afterward), and the
704+
up to date (so that you don't have to refresh it afterward), and the
705705
`-a` flag means "check out all files" (if you have a stale copy or an
706706
older version of a checked out tree you may also need to add the `-f`
707707
flag first, to tell 'git checkout-index' to *force* overwriting of any old
@@ -1283,7 +1283,7 @@ run a single command, 'git-receive-pack'.
12831283

12841284
First, you need to create an empty repository on the remote
12851285
machine that will house your public repository. This empty
1286-
repository will be populated and be kept up-to-date by pushing
1286+
repository will be populated and be kept up to date by pushing
12871287
into it later. Obviously, this repository creation needs to be
12881288
done only once.
12891289

@@ -1450,7 +1450,7 @@ transport protocols (HTTP), you need to keep this repository
14501450
would contain a call to 'git update-server-info'
14511451
but you need to manually enable the hook with
14521452
`mv post-update.sample post-update`. This makes sure
1453-
'git update-server-info' keeps the necessary files up-to-date.
1453+
'git update-server-info' keeps the necessary files up to date.
14541454

14551455
3. Push into the public repository from your primary
14561456
repository.

0 commit comments

Comments
 (0)