Re: [PATCH 2/2] treewide: correct several "up-to-date" to "up to date"

2017-08-24 Thread Martin Ågren 
On 24 August 2017 at 05:51, STEVEN WHITE
 wrote:
> On Wed, Aug 23, 2017 at 10:49 AM, Martin Ågren  wrote:
>> 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).

> These corrections all look great (English-language-wise). :)

Great. Thanks for checking.

Re: [PATCH 2/2] treewide: correct several "up-to-date" to "up to date"

2017-08-23 Thread STEVEN WHITE 
These corrections all look great (English-language-wise). :)

On Wed, Aug 23, 2017 at 10:49 AM, Martin Ågren  wrote:
> 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 
> Reported-by: STEVEN WHITE 
> Signed-off-by: Martin Ågren 
> ---
> I figure "Already up-to-date." is "[X is|I am] already up to date." as
> opposed to "Already [have] up-to-date [X].".
>
>  Documentation/git-apply.txt   | 4 ++--
>  Documentation/git-cvsserver.txt   | 2 +-
>  Documentation/git-diff-index.txt  | 6 +++---
>  Documentation/git-merge.txt   | 2 +-
>  Documentation/git-rebase.txt  | 2 +-
>  Documentation/git-rerere.txt  | 2 +-
>  Documentation/git-rm.txt  | 2 +-
>  Documentation/git-svn.txt | 2 +-
>  Documentation/git-update-index.txt| 2 +-
>  Documentation/gitcore-tutorial.txt| 8 
>  Documentation/githooks.txt| 2 +-
>  Documentation/gitrepository-layout.txt| 2 +-
>  Documentation/gittutorial.txt | 2 +-
>  Documentation/merge-options.txt   | 2 +-
>  Documentation/technical/pack-protocol.txt | 2 +-
>  Documentation/technical/trivial-merge.txt | 4 ++--
>  Documentation/user-manual.txt | 2 +-
>  t/t6040-tracking-info.sh  | 4 ++--
>  contrib/examples/git-merge.sh | 4 ++--
>  contrib/examples/git-resolve.sh   | 2 +-
>  contrib/subtree/t/t7900-subtree.sh| 2 +-
>  git-merge-octopus.sh  | 2 +-
>  builtin/merge.c   | 4 ++--
>  merge-recursive.c | 2 +-
>  notes-merge.c | 2 +-
>  remote.c  | 2 +-
>  unpack-trees.c| 2 +-
>  git-gui/po/README | 2 +-
>  git-p4.py | 2 +-
>  templates/hooks--pre-rebase.sample| 2 +-
>  30 files changed, 40 insertions(+), 40 deletions(-)
>
> diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
> index 631cbd840..4ebc3d327 100644
> --- a/Documentation/git-apply.txt
> +++ b/Documentation/git-apply.txt
> @@ -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
> diff --git a/Documentation/git-cvsserver.txt b/Documentation/git-cvsserver.txt
> index a336ae5f6..ba90066f1 100644
> --- a/Documentation/git-cvsserver.txt
> +++ b/Documentation/git-cvsserver.txt
> @@ -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..sqlite`. Note that the SQLite backend creates
> diff --git a/Documentation/git-diff-index.txt 
> b/Documentation/git-diff-index.txt
> index a17150695..b38067771 100644
> --- a/Documentation/git-diff-index.txt
> +++ b/Documentation/git-diff-index.txt
> @@ -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.

[PATCH 2/2] treewide: correct several "up-to-date" to "up to date"

2017-08-23 Thread Martin Ågren 
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 
Reported-by: STEVEN WHITE 
Signed-off-by: Martin Ågren 
---
I figure "Already up-to-date." is "[X is|I am] already up to date." as
opposed to "Already [have] up-to-date [X].".

 Documentation/git-apply.txt   | 4 ++--
 Documentation/git-cvsserver.txt   | 2 +-
 Documentation/git-diff-index.txt  | 6 +++---
 Documentation/git-merge.txt   | 2 +-
 Documentation/git-rebase.txt  | 2 +-
 Documentation/git-rerere.txt  | 2 +-
 Documentation/git-rm.txt  | 2 +-
 Documentation/git-svn.txt | 2 +-
 Documentation/git-update-index.txt| 2 +-
 Documentation/gitcore-tutorial.txt| 8 
 Documentation/githooks.txt| 2 +-
 Documentation/gitrepository-layout.txt| 2 +-
 Documentation/gittutorial.txt | 2 +-
 Documentation/merge-options.txt   | 2 +-
 Documentation/technical/pack-protocol.txt | 2 +-
 Documentation/technical/trivial-merge.txt | 4 ++--
 Documentation/user-manual.txt | 2 +-
 t/t6040-tracking-info.sh  | 4 ++--
 contrib/examples/git-merge.sh | 4 ++--
 contrib/examples/git-resolve.sh   | 2 +-
 contrib/subtree/t/t7900-subtree.sh| 2 +-
 git-merge-octopus.sh  | 2 +-
 builtin/merge.c   | 4 ++--
 merge-recursive.c | 2 +-
 notes-merge.c | 2 +-
 remote.c  | 2 +-
 unpack-trees.c| 2 +-
 git-gui/po/README | 2 +-
 git-p4.py | 2 +-
 templates/hooks--pre-rebase.sample| 2 +-
 30 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
index 631cbd840..4ebc3d327 100644
--- a/Documentation/git-apply.txt
+++ b/Documentation/git-apply.txt
@@ -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
diff --git a/Documentation/git-cvsserver.txt b/Documentation/git-cvsserver.txt
index a336ae5f6..ba90066f1 100644
--- a/Documentation/git-cvsserver.txt
+++ b/Documentation/git-cvsserver.txt
@@ -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..sqlite`. Note that the SQLite backend creates
diff --git a/Documentation/git-diff-index.txt b/Documentation/git-diff-index.txt
index a17150695..b38067771 100644
--- a/Documentation/git-diff-index.txt
+++ b/Documentation/git-diff-index.txt
@@ -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... 00...  kernel/sched.c
 
-i.e., it shows that the tree has changed, and that