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>

diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
index 631cbd840a08eb29add1e900ac9272992669a75c..4ebc3d32719dfefa988d34b41871f0e9fb969471 100644 (file)
--- 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
        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::
        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
 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
 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 a336ae5f6fd5587aa8f778d2378783d0fe2e6dc4..ba90066f108cf525eb7781c1607d65358c617b0e 100644 (file)
--- 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 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
 
 By default it uses SQLite databases in the Git directory, named
 `gitcvs.<module_name>.sqlite`. Note that the SQLite backend creates

diff --git a/Documentation/git-diff-index.txt b/Documentation/git-diff-index.txt
index a1715069529eba9d143d527c058e962381efd743..b380677718ae129b4643814d7c1a16351ce4d779 100644 (file)
--- 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
 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'
 
 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
 
   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.
 
 get the real diff, you need to look at the object in the working directory
 directly rather than do an object-to-object diff.
 

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 04fdd8cf086db6413a01421c306a80c9583f7fa4..53366a17005e95824bb948255c681f84ab15e9dd 100644 (file)
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -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'
 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
 ------------------
 
 FAST-FORWARD MERGE
 ------------------

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 4f6bed61a92b74e4540b71e0e0cac7cba60302ca..6805a74aec20cacd7b9320136b8648ad5b40ef5b 100644 (file)
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -334,7 +334,7 @@ which makes little sense.
 
 -f::
 --force-rebase::
 
 -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
        the command without `--force` would return without doing anything.
 +
 You may find this (or --no-ff with an interactive rebase) helpful after

diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt
index 9ee083c415a27dc499b75031d49df9e3f3856ec0..031f31fa471154f474b35448564aff6c8c2b3f51 100644 (file)
--- a/Documentation/git-rerere.txt
+++ b/Documentation/git-rerere.txt
@@ -205,7 +205,7 @@ development on the topic branch:
 ------------
 
 you could run `git rebase master topic`, to bring yourself
 ------------
 
 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
 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

diff --git a/Documentation/git-rm.txt b/Documentation/git-rm.txt
index 683e59133003536c776c476304e369bdd80e27a2..b5c46223c44b1b17673ae4782f74528b3d151bed 100644 (file)
--- a/Documentation/git-rm.txt
+++ b/Documentation/git-rm.txt
@@ -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).
 
 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
 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

diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index aa2aeabb60209fabd772907a91c2812b2a305d7d..636e09048e8846b813166737ef58eef96eb3a3c4 100644 (file)
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -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
 '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
        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

diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt
index 1579abf3c3b45f4e63f8f17746dde31a06a3a564..e19eba62cda292cc51407cbcd7e94675560f97f2 100644 (file)
--- a/Documentation/git-update-index.txt
+++ b/Documentation/git-update-index.txt
@@ -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
 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.
 "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.

diff --git a/Documentation/gitcore-tutorial.txt b/Documentation/gitcore-tutorial.txt
index 7577f27ec20c90eabea2652a438ca09961559f6a..e29a9effccbcf439fec8a8fe9bfd1927f58439d7 100644 (file)
--- a/Documentation/gitcore-tutorial.txt
+++ b/Documentation/gitcore-tutorial.txt
@@ -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
 ----------------
 +
 $ 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
 
 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
 ----------------
 
 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
 `-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
 
 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.
 
 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
 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.
 
 3. Push into the public repository from your primary
    repository.

diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt
index b2514f4d4426a730e65bcae264a6364eb50bcd60..99abfc73a7822b00fdcd6bd8788c082dc01871d4 100644 (file)
--- a/Documentation/githooks.txt
+++ b/Documentation/githooks.txt
@@ -369,7 +369,7 @@ them.
 
 When enabled, the default 'post-update' hook runs
 'git update-server-info' to keep the information used by dumb
 
 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.
 
 a Git repository that is accessible via HTTP, you should
 probably enable this hook.
 

diff --git a/Documentation/gitrepository-layout.txt b/Documentation/gitrepository-layout.txt
index f51ed4e37cd3fad80bf855e6217906f094f894fb..adf9554ad2f84cb69a6b0a940e4d3e0e336df9ff 100644 (file)
--- a/Documentation/gitrepository-layout.txt
+++ b/Documentation/gitrepository-layout.txt
@@ -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
        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.
 
        published for dumb transports.  'git repack' does this
        by default.
 

diff --git a/Documentation/gittutorial.txt b/Documentation/gittutorial.txt
index 794b83393ea21a8d569c34791ee4af1dfb99a57a..242de31cb6ccc6600b94a68a9efd215df2cb71f7 100644 (file)
--- a/Documentation/gittutorial.txt
+++ b/Documentation/gittutorial.txt
@@ -109,7 +109,7 @@ summary of the situation with 'git status':
 $ git status
 On branch master
 Changes to be committed:
 $ 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
   (use "git reset HEAD <file>..." to unstage)
 
        modified:   file1

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 5b4a62e93624bc8289c835631aab5d5f13dff708..4e323043017deee83d547e52e7797dd61a02cd5d 100644 (file)
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -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
 
 --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>]::
        resolved as a fast-forward.
 
 --log[=<n>]::

diff --git a/Documentation/technical/pack-protocol.txt b/Documentation/technical/pack-protocol.txt
index a34917153fd3dc10fefe71a1ba05e5dacb9af7f9..ed1eae8b83a651d34f9ce2488f58d02a763fbfd4 100644 (file)
--- a/Documentation/technical/pack-protocol.txt
+++ b/Documentation/technical/pack-protocol.txt
@@ -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
 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,
 
 Otherwise, it enters the negotiation phase, where the client and
 server determine what the minimal packfile necessary for transport is,

diff --git a/Documentation/technical/trivial-merge.txt b/Documentation/technical/trivial-merge.txt
index c79d4a7c476da2c57c117529150de77646ed116e..1f1c33d0da30dbdf90c37bd808eb52059b598c84 100644 (file)
--- a/Documentation/technical/trivial-merge.txt
+++ b/Documentation/technical/trivial-merge.txt
@@ -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
 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.
 
 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
 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.
 
 *empty* means that the tree must not have a directory-file conflict
  with the entry.

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index d3c53b51308186b99a0c0407529a27619cb845bf..b4d88af133e8eafd92f86443bd74de063bad4835 100644 (file)
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -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
 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
 <<repositories-and-branches>>.
 
 Now create the branches in which you are going to work; these start out

diff --git a/builtin/merge.c b/builtin/merge.c
index 900bafdb45d0b28ab5497cfd251535266fc92be5..a0789c798fd68f1dcd79a5925ceb25a965228e55 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -1345,7 +1345,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
                 * If head can reach all the merge then we are up to date.
                 * but first the most common case of merging one remote.
                 */
                 * If head can reach all the merge then we are up to date.
                 * but first the most common case of merging one remote.
                 */

-               finish_up_to_date(_("Already up-to-date."));
+               finish_up_to_date(_("Already up to date."));

                goto done;
        } else if (fast_forward != FF_NO && !remoteheads->next &&
                        !common->next &&
                goto done;
        } else if (fast_forward != FF_NO && !remoteheads->next &&
                        !common->next &&


@@ -1428,7 +1428,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
                        }
                }
                if (up_to_date) {
                        }
                }
                if (up_to_date) {

-                       finish_up_to_date(_("Already up-to-date. Yeeah!"));
+                       finish_up_to_date(_("Already up to date. Yeeah!"));

                        goto done;
                }
        }
                        goto done;
                }
        }

diff --git a/contrib/examples/git-merge.sh b/contrib/examples/git-merge.sh
index ee99f1a4ee89a9e9f358b6cc89fc84cab554b439..932e78dbfee97750ae38afcf699e95f118f956dd 100755 (executable)
--- a/contrib/examples/git-merge.sh
+++ b/contrib/examples/git-merge.sh
@@ -399,7 +399,7 @@ case "$allow_fast_forward,$#,$common,$no_commit" in
 ?,1,"$1",*)
        # If head can reach all the merge then we are up to date.
        # but first the most common case of merging one remote.
 ?,1,"$1",*)
        # If head can reach all the merge then we are up to date.
        # but first the most common case of merging one remote.

-       finish_up_to_date "Already up-to-date."
+       finish_up_to_date "Already up to date."

        exit 0
        ;;
 t,1,"$head",*)
        exit 0
        ;;
 t,1,"$head",*)


@@ -459,7 +459,7 @@ t,1,"$head",*)
        done
        if test "$up_to_date" = t
        then
        done
        if test "$up_to_date" = t
        then

-               finish_up_to_date "Already up-to-date. Yeeah!"
+               finish_up_to_date "Already up to date. Yeeah!"

                exit 0
        fi
        ;;
                exit 0
        fi
        ;;

diff --git a/contrib/examples/git-resolve.sh b/contrib/examples/git-resolve.sh
index 70fdc27b724f28793c6a4bff713957a22689b78b..3099dc851ac26a9280e7e6d1a73638c05d01cc17 100755 (executable)
--- a/contrib/examples/git-resolve.sh
+++ b/contrib/examples/git-resolve.sh
@@ -41,7 +41,7 @@ fi
 
 case "$common" in
 "$merge")
 
 case "$common" in
 "$merge")

-       echo "Already up-to-date. Yeeah!"
+       echo "Already up to date. Yeeah!"

        dropheads
        exit 0
        ;;
        dropheads
        exit 0
        ;;

diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh
index 3c87ebaf57baede9810c3b9b489eed9751189706..d05c613c9718697f64bc2334dc9ae85bf473f13e 100755 (executable)
--- a/contrib/subtree/t/t7900-subtree.sh
+++ b/contrib/subtree/t/t7900-subtree.sh
@@ -253,7 +253,7 @@ test_expect_success 'merge the added subproj again, should do nothing' '
                # this shouldn not actually do anything, since FETCH_HEAD
                # is already a parent
                result=$(git merge -s ours -m "merge -s -ours" FETCH_HEAD) &&
                # this shouldn not actually do anything, since FETCH_HEAD
                # is already a parent
                result=$(git merge -s ours -m "merge -s -ours" FETCH_HEAD) &&

-               check_equal "${result}" "Already up-to-date."
+               check_equal "${result}" "Already up to date."

        )
 '
 
        )
 '
 

diff --git a/git-gui/po/README b/git-gui/po/README
index 0f5837d48e7040e9d2b07513666b608353736645..2514bc22abf4aedfaa8d641976c96fbf222bb8a7 100644 (file)
--- a/git-gui/po/README
+++ b/git-gui/po/README
@@ -165,7 +165,7 @@ to contribute an update.  This may be because you would want to improve
 the translation of existing messages, or because the git-gui software
 itself was updated and there are new messages that need translation.
 
 the translation of existing messages, or because the git-gui software
 itself was updated and there are new messages that need translation.
 

-In any case, make sure you are up-to-date before starting your work:
+In any case, make sure you are up to date before starting your work:

 
        $ git checkout master
        $ git pull
 
        $ git checkout master
        $ git pull

diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh
index bcf0d92ec223bf9e1f0995c5acef6376d1299502..5b2162c89d7b1bb110e08d273172256abb0829a4 100755 (executable)
--- a/git-merge-octopus.sh
+++ b/git-merge-octopus.sh
@@ -74,7 +74,7 @@ do
 
        case "$LF$common$LF" in
        *"$LF$SHA1$LF"*)
 
        case "$LF$common$LF" in
        *"$LF$SHA1$LF"*)

-               eval_gettextln "Already up-to-date with \$pretty_name"
+               eval_gettextln "Already up to date with \$pretty_name"

                continue
                ;;
        esac
                continue
                ;;
        esac

diff --git a/git-p4.py b/git-p4.py
index 2fa581789c5d9d4dd967e1783c513d64660f8a9c..76859b453afc2d5ba6897d15a680245b455f4f38 100755 (executable)
--- a/git-p4.py
+++ b/git-p4.py
@@ -3614,7 +3614,7 @@ def run(self, args):
 
     def rebase(self):
         if os.system("git update-index --refresh") != 0:
 
     def rebase(self):
         if os.system("git update-index --refresh") != 0:

-            die("Some files in your working directory are modified and different than what is in your index. You can use git update-index <filename> to bring the index up-to-date or stash away all your changes with git stash.");
+            die("Some files in your working directory are modified and different than what is in your index. You can use git update-index <filename> to bring the index up to date or stash away all your changes with git stash.");

         if len(read_pipe("git diff-index HEAD --")) > 0:
             die("You have uncommitted changes. Please commit them before rebasing or stash them away with git stash.");
 
         if len(read_pipe("git diff-index HEAD --")) > 0:
             die("You have uncommitted changes. Please commit them before rebasing or stash them away with git stash.");
 

diff --git a/merge-recursive.c b/merge-recursive.c
index 1494ffdb828106882053065e3ac8cc383136cf80..182626c02781384733b863b025bcfc5a1978e893 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1927,7 +1927,7 @@ int merge_trees(struct merge_options *o,
        }
 
        if (oid_eq(&common->object.oid, &merge->object.oid)) {
        }
 
        if (oid_eq(&common->object.oid, &merge->object.oid)) {

-               output(o, 0, _("Already up-to-date!"));
+               output(o, 0, _("Already up to date!"));

                *result = head;
                return 1;
        }
                *result = head;
                return 1;
        }

diff --git a/notes-merge.c b/notes-merge.c
index 70e3fbeefbe24233a545e75c0322a8a310778e43..a4cb76f0f54b544dfc1ca30b66d9750c9e223ff1 100644 (file)
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -625,7 +625,7 @@ int notes_merge(struct notes_merge_options *o,
        if (!oidcmp(&remote->object.oid, base_oid)) {
                /* Already merged; result == local commit */
                if (o->verbosity >= 2)
        if (!oidcmp(&remote->object.oid, base_oid)) {
                /* Already merged; result == local commit */
                if (o->verbosity >= 2)

-                       printf("Already up-to-date!\n");
+                       printf("Already up to date!\n");

                oidcpy(result_oid, &local->object.oid);
                goto found_result;
        }
                oidcpy(result_oid, &local->object.oid);
                goto found_result;
        }

diff --git a/remote.c b/remote.c
index 60d004392109f1e39f0bf34578e195cdf3af1639..0f1992fbf98ff19a79d288c8fead764c6b5d072f 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -2080,7 +2080,7 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb)
                                _("  (use \"git branch --unset-upstream\" to fixup)\n"));
        } else if (!ours && !theirs) {
                strbuf_addf(sb,
                                _("  (use \"git branch --unset-upstream\" to fixup)\n"));
        } else if (!ours && !theirs) {
                strbuf_addf(sb,

-                       _("Your branch is up-to-date with '%s'.\n"),
+                       _("Your branch is up to date with '%s'.\n"),

                        base);
        } else if (!theirs) {
                strbuf_addf(sb,
                        base);
        } else if (!theirs) {
                strbuf_addf(sb,

diff --git a/t/t6040-tracking-info.sh b/t/t6040-tracking-info.sh
index 97a07655a0e0d74747259498bfbb8d03ea6c7480..16ca6081faac3bd58b25a5f6ff5252b6d74a78c7 100755 (executable)
--- a/t/t6040-tracking-info.sh
+++ b/t/t6040-tracking-info.sh
@@ -100,7 +100,7 @@ test_expect_success 'checkout (up-to-date with upstream)' '
        (
                cd test && git checkout b6
        ) >actual &&
        (
                cd test && git checkout b6
        ) >actual &&

-       test_i18ngrep "Your branch is up-to-date with .origin/master" actual
+       test_i18ngrep "Your branch is up to date with .origin/master" actual

 '
 
 test_expect_success 'status (diverged from upstream)' '
 '
 
 test_expect_success 'status (diverged from upstream)' '


@@ -130,7 +130,7 @@ test_expect_success 'status (up-to-date with upstream)' '
                # reports nothing to commit
                test_must_fail git commit --dry-run
        ) >actual &&
                # reports nothing to commit
                test_must_fail git commit --dry-run
        ) >actual &&

-       test_i18ngrep "Your branch is up-to-date with .origin/master" actual
+       test_i18ngrep "Your branch is up to date with .origin/master" actual

 '
 
 cat >expect <<\EOF
 '
 
 cat >expect <<\EOF

diff --git a/templates/hooks--pre-rebase.sample b/templates/hooks--pre-rebase.sample
index b7f81c198e22e4ce578a6148fa3346becabbfb3b..db5feab8a1ee6433108ade9e165956678a3e260b 100755 (executable)
--- a/templates/hooks--pre-rebase.sample
+++ b/templates/hooks--pre-rebase.sample
@@ -58,7 +58,7 @@ then
        not_in_topic=`git rev-list "^$topic" master`
        if test -z "$not_in_topic"
        then
        not_in_topic=`git rev-list "^$topic" master`
        if test -z "$not_in_topic"
        then

-               echo >&2 "$topic is already up-to-date with master"
+               echo >&2 "$topic is already up to date with master"

                exit 1 ;# we could allow it, but there is no point.
        else
                exit 0
                exit 1 ;# we could allow it, but there is no point.
        else
                exit 0

diff --git a/unpack-trees.c b/unpack-trees.c
index dd535bc8497e5d8202a94923fd0a68c3f46907fd..a2fe4e052d60e6a15ab2e8e21ebebf6353059b77 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -162,7 +162,7 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
        msgs[ERROR_BIND_OVERLAP] = _("Entry '%s' overlaps with '%s'.  Cannot bind.");
 
        msgs[ERROR_SPARSE_NOT_UPTODATE_FILE] =
        msgs[ERROR_BIND_OVERLAP] = _("Entry '%s' overlaps with '%s'.  Cannot bind.");
 
        msgs[ERROR_SPARSE_NOT_UPTODATE_FILE] =

-               _("Cannot update sparse checkout: the following entries are not up-to-date:\n%s");
+               _("Cannot update sparse checkout: the following entries are not up to date:\n%s");

        msgs[ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN] =
                _("The following working tree files would be overwritten by sparse checkout update:\n%s");
        msgs[ERROR_WOULD_LOSE_ORPHANED_REMOVED] =
        msgs[ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN] =
                _("The following working tree files would be overwritten by sparse checkout update:\n%s");
        msgs[ERROR_WOULD_LOSE_ORPHANED_REMOVED] =