+2 -2

Documentation/git-apply.txt

··· 66 66 disables it is in effect), make sure the patch is 67 67 applicable to what the current index file records. If 68 68 the file to be patched in the working tree is not 69 69 - up-to-date, it is flagged as an error. This flag also 69 69 + up to date, it is flagged as an error. This flag also 70 70 causes the index file to be updated. 71 71 72 72 --cached:: ··· 259 259 If `--index` is specified (explicitly or implicitly), then the submodule 260 260 commits must match the index exactly for the patch to apply. If any 261 261 of the submodules are checked-out, then these check-outs are completely 262 262 - ignored, i.e., they are not required to be up-to-date or clean and they 262 262 + ignored, i.e., they are not required to be up to date or clean and they 263 263 are not updated. 264 264 265 265 If `--index` is not specified, then the submodule commits in the patch

+1 -1

Documentation/git-cvsserver.txt

··· 223 223 That means that even if you offer only read access (e.g. by using 224 224 the pserver method), 'git-cvsserver' should have write access to 225 225 the database to work reliably (otherwise you need to make sure 226 226 - that the database is up-to-date any time 'git-cvsserver' is executed). 226 226 + that the database is up to date any time 'git-cvsserver' is executed). 227 227 228 228 By default it uses SQLite databases in the Git directory, named 229 229 `gitcvs.<module_name>.sqlite`. Note that the SQLite backend creates

+3 -3

Documentation/git-diff-index.txt

··· 85 85 The non-cached version asks the question: 86 86 87 87 show me the differences between HEAD and the currently checked out 88 88 - tree - index contents _and_ files that aren't up-to-date 88 88 + tree - index contents _and_ files that aren't up to date 89 89 90 90 which is obviously a very useful question too, since that tells you what 91 91 you *could* commit. Again, the output matches the 'git diff-tree -r' ··· 100 100 torvalds@ppc970:~/v2.6/linux> git diff-index --abbrev HEAD 101 101 :100644 100664 7476bb... 000000... kernel/sched.c 102 102 103 103 - i.e., it shows that the tree has changed, and that `kernel/sched.c` has is 104 104 - not up-to-date and may contain new stuff. The all-zero sha1 means that to 103 103 + i.e., it shows that the tree has changed, and that `kernel/sched.c` is 104 104 + not up to date and may contain new stuff. The all-zero sha1 means that to 105 105 get the real diff, you need to look at the object in the working directory 106 106 directly rather than do an object-to-object diff. 107 107

+1 -1

Documentation/git-merge.txt

··· 141 141 would result from the merge already.) 142 142 143 143 If all named commits are already ancestors of `HEAD`, 'git merge' 144 144 - will exit early with the message "Already up-to-date." 144 144 + will exit early with the message "Already up to date." 145 145 146 146 FAST-FORWARD MERGE 147 147 ------------------

+1 -1

Documentation/git-rebase.txt

··· 334 334 335 335 -f:: 336 336 --force-rebase:: 337 337 - Force a rebase even if the current branch is up-to-date and 337 337 + Force a rebase even if the current branch is up to date and 338 338 the command without `--force` would return without doing anything. 339 339 + 340 340 You may find this (or --no-ff with an interactive rebase) helpful after

+1 -1

Documentation/git-rerere.txt

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

+1 -1

Documentation/git-rm.txt

··· 146 146 in the linkgit:gitmodules[5] file will also be removed and that file 147 147 will be staged (unless --cached or -n are used). 148 148 149 149 - A submodule is considered up-to-date when the HEAD is the same as 149 149 + A submodule is considered up to date when the HEAD is the same as 150 150 recorded in the index, no tracked files are modified and no untracked 151 151 files that aren't ignored are present in the submodules work tree. 152 152 Ignored files are deemed expendable and won't stop a submodule's work

+1 -1

Documentation/git-svn.txt

··· 424 424 'set-tree':: 425 425 You should consider using 'dcommit' instead of this command. 426 426 Commit specified commit or tree objects to SVN. This relies on 427 427 - your imported fetch data being up-to-date. This makes 427 427 + your imported fetch data being up to date. This makes 428 428 absolutely no attempts to do patching when committing to SVN, it 429 429 simply overwrites files with those specified in the tree or 430 430 commit. All merging is assumed to have taken place

+1 -1

Documentation/git-update-index.txt

··· 214 214 Using --refresh 215 215 --------------- 216 216 `--refresh` does not calculate a new sha1 file or bring the index 217 217 - up-to-date for mode/content changes. But what it *does* do is to 217 217 + up to date for mode/content changes. But what it *does* do is to 218 218 "re-match" the stat information of a file with the index, so that you 219 219 can refresh the index for a file that hasn't been changed but where 220 220 the stat entry is out of date.

+4 -4

Documentation/gitcore-tutorial.txt

··· 631 631 $ git update-index --refresh 632 632 ---------------- 633 633 + 634 634 - in the new repository to make sure that the index file is up-to-date. 634 634 + in the new repository to make sure that the index file is up to date. 635 635 636 636 Note that the second point is true even across machines. You can 637 637 duplicate a remote Git repository with *any* regular copy mechanism, be it ··· 701 701 ---------------- 702 702 703 703 where the `-u` flag means that you want the checkout to keep the index 704 704 - up-to-date (so that you don't have to refresh it afterward), and the 704 704 + up to date (so that you don't have to refresh it afterward), and the 705 705 `-a` flag means "check out all files" (if you have a stale copy or an 706 706 older version of a checked out tree you may also need to add the `-f` 707 707 flag first, to tell 'git checkout-index' to *force* overwriting of any old ··· 1283 1283 1284 1284 First, you need to create an empty repository on the remote 1285 1285 machine that will house your public repository. This empty 1286 1286 - repository will be populated and be kept up-to-date by pushing 1286 1286 + repository will be populated and be kept up to date by pushing 1287 1287 into it later. Obviously, this repository creation needs to be 1288 1288 done only once. 1289 1289 ··· 1450 1450 would contain a call to 'git update-server-info' 1451 1451 but you need to manually enable the hook with 1452 1452 `mv post-update.sample post-update`. This makes sure 1453 1453 - 'git update-server-info' keeps the necessary files up-to-date. 1453 1453 + 'git update-server-info' keeps the necessary files up to date. 1454 1454 1455 1455 3. Push into the public repository from your primary 1456 1456 repository.

+1 -1

Documentation/githooks.txt

··· 369 369 370 370 When enabled, the default 'post-update' hook runs 371 371 'git update-server-info' to keep the information used by dumb 372 372 - transports (e.g., HTTP) up-to-date. If you are publishing 372 372 + transports (e.g., HTTP) up to date. If you are publishing 373 373 a Git repository that is accessible via HTTP, you should 374 374 probably enable this hook. 375 375

+1 -1

Documentation/gitrepository-layout.txt

··· 71 71 This file is to help dumb transports discover what packs 72 72 are available in this object store. Whenever a pack is 73 73 added or removed, `git update-server-info` should be run 74 74 - to keep this file up-to-date if the repository is 74 74 + to keep this file up to date if the repository is 75 75 published for dumb transports. 'git repack' does this 76 76 by default. 77 77

+1 -1

Documentation/gittutorial.txt

··· 109 109 $ git status 110 110 On branch master 111 111 Changes to be committed: 112 112 - Your branch is up-to-date with 'origin/master'. 112 112 + Your branch is up to date with 'origin/master'. 113 113 (use "git reset HEAD <file>..." to unstage) 114 114 115 115 modified: file1

+1 -1

Documentation/merge-options.txt

··· 39 39 40 40 --ff-only:: 41 41 Refuse to merge and exit with a non-zero status unless the 42 42 - current `HEAD` is already up-to-date or the merge can be 42 42 + current `HEAD` is already up to date or the merge can be 43 43 resolved as a fast-forward. 44 44 45 45 --log[=<n>]::

+1 -1

Documentation/technical/pack-protocol.txt

··· 199 199 terminate the connection by sending a flush-pkt, telling the server it can 200 200 now gracefully terminate, and disconnect, when it does not need any pack 201 201 data. This can happen with the ls-remote command, and also can happen when 202 202 - the client already is up-to-date. 202 202 + the client already is up to date. 203 203 204 204 Otherwise, it enters the negotiation phase, where the client and 205 205 server determine what the minimal packfile necessary for transport is,

+2 -2

Documentation/technical/trivial-merge.txt

··· 32 32 If multiple cases apply, the one used is listed first. 33 33 34 34 A result which changes the index is an error if the index is not empty 35 35 - and not up-to-date. 35 35 + and not up to date. 36 36 37 37 Entries marked '+' have stat information. Spaces marked '*' don't 38 38 affect the result. ··· 65 65 left in stage 0, and there are no other entries. 66 66 67 67 A result of "no merge" is an error if the index is not empty and not 68 68 - up-to-date. 68 68 + up to date. 69 69 70 70 *empty* means that the tree must not have a directory-file conflict 71 71 with the entry.

+7 -5

Documentation/user-manual.txt

··· 2044 2044 remote branch, then it will fail with an error like: 2045 2045 2046 2046 ------------------------------------------------- 2047 2047 - error: remote 'refs/heads/master' is not an ancestor of 2048 2048 - local 'refs/heads/master'. 2049 2049 - Maybe you are not up-to-date and need to pull first? 2050 2050 - error: failed to push to 'ssh://yourserver.com/~you/proj.git' 2047 2047 + ! [rejected] master -> master (non-fast-forward) 2048 2048 + error: failed to push some refs to '...' 2049 2049 + hint: Updates were rejected because the tip of your current branch is behind 2050 2050 + hint: its remote counterpart. Integrate the remote changes (e.g. 2051 2051 + hint: 'git pull ...') before pushing again. 2052 2052 + hint: See the 'Note about fast-forwards' in 'git push --help' for details. 2051 2053 ------------------------------------------------- 2052 2054 2053 2055 This can happen, for example, if you: ··· 2193 2195 Linus's tree will be stored in the remote-tracking branch named origin/master, 2194 2196 and can be updated using linkgit:git-fetch[1]; you can track other 2195 2197 public trees using linkgit:git-remote[1] to set up a "remote" and 2196 2196 - linkgit:git-fetch[1] to keep them up-to-date; see 2198 2198 + linkgit:git-fetch[1] to keep them up to date; see 2197 2199 <<repositories-and-branches>>. 2198 2200 2199 2201 Now create the branches in which you are going to work; these start out

+2 -2

builtin/merge.c

··· 1359 1359 * If head can reach all the merge then we are up to date. 1360 1360 * but first the most common case of merging one remote. 1361 1361 */ 1362 1362 - finish_up_to_date(_("Already up-to-date.")); 1362 1362 + finish_up_to_date(_("Already up to date.")); 1363 1363 goto done; 1364 1364 } else if (fast_forward != FF_NO && !remoteheads->next && 1365 1365 !common->next && ··· 1442 1442 } 1443 1443 } 1444 1444 if (up_to_date) { 1445 1445 - finish_up_to_date(_("Already up-to-date. Yeeah!")); 1445 1445 + finish_up_to_date(_("Already up to date. Yeeah!")); 1446 1446 goto done; 1447 1447 } 1448 1448 }

+2 -2

contrib/examples/git-merge.sh

··· 399 399 ?,1,"$1",*) 400 400 # If head can reach all the merge then we are up to date. 401 401 # but first the most common case of merging one remote. 402 402 - finish_up_to_date "Already up-to-date." 402 402 + finish_up_to_date "Already up to date." 403 403 exit 0 404 404 ;; 405 405 t,1,"$head",*) ··· 459 459 done 460 460 if test "$up_to_date" = t 461 461 then 462 462 - finish_up_to_date "Already up-to-date. Yeeah!" 462 462 + finish_up_to_date "Already up to date. Yeeah!" 463 463 exit 0 464 464 fi 465 465 ;;

+1 -1

contrib/examples/git-resolve.sh

··· 41 41 42 42 case "$common" in 43 43 "$merge") 44 44 - echo "Already up-to-date. Yeeah!" 44 44 + echo "Already up to date. Yeeah!" 45 45 dropheads 46 46 exit 0 47 47 ;;

+1 -1

contrib/subtree/t/t7900-subtree.sh

··· 253 253 # this shouldn not actually do anything, since FETCH_HEAD 254 254 # is already a parent 255 255 result=$(git merge -s ours -m "merge -s -ours" FETCH_HEAD) && 256 256 - check_equal "${result}" "Already up-to-date." 256 256 + check_equal "${result}" "Already up to date." 257 257 ) 258 258 ' 259 259

+1 -1

git-gui/po/README

··· 165 165 the translation of existing messages, or because the git-gui software 166 166 itself was updated and there are new messages that need translation. 167 167 168 168 - In any case, make sure you are up-to-date before starting your work: 168 168 + In any case, make sure you are up to date before starting your work: 169 169 170 170 $ git checkout master 171 171 $ git pull

+1 -1

git-merge-octopus.sh

··· 74 74 75 75 case "$LF$common$LF" in 76 76 *"$LF$SHA1$LF"*) 77 77 - eval_gettextln "Already up-to-date with \$pretty_name" 77 77 + eval_gettextln "Already up to date with \$pretty_name" 78 78 continue 79 79 ;; 80 80 esac

+1 -1

git-p4.py

··· 3614 3614 3615 3615 def rebase(self): 3616 3616 if os.system("git update-index --refresh") != 0: 3617 3617 - 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."); 3617 3617 + 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."); 3618 3618 if len(read_pipe("git diff-index HEAD --")) > 0: 3619 3619 die("You have uncommitted changes. Please commit them before rebasing or stash them away with git stash."); 3620 3620

+1 -1

merge-recursive.c

··· 1927 1927 } 1928 1928 1929 1929 if (oid_eq(&common->object.oid, &merge->object.oid)) { 1930 1930 - output(o, 0, _("Already up-to-date!")); 1930 1930 + output(o, 0, _("Already up to date!")); 1931 1931 *result = head; 1932 1932 return 1; 1933 1933 }

+1 -1

notes-merge.c

··· 624 624 if (!oidcmp(&remote->object.oid, base_oid)) { 625 625 /* Already merged; result == local commit */ 626 626 if (o->verbosity >= 2) 627 627 - printf("Already up-to-date!\n"); 627 627 + printf("Already up to date!\n"); 628 628 oidcpy(result_oid, &local->object.oid); 629 629 goto found_result; 630 630 }

+1 -1

remote.c

··· 2084 2084 _(" (use \"git branch --unset-upstream\" to fixup)\n")); 2085 2085 } else if (!ours && !theirs) { 2086 2086 strbuf_addf(sb, 2087 2087 - _("Your branch is up-to-date with '%s'.\n"), 2087 2087 + _("Your branch is up to date with '%s'.\n"), 2088 2088 base); 2089 2089 } else if (!theirs) { 2090 2090 strbuf_addf(sb,

+2 -2

t/t6040-tracking-info.sh

··· 100 100 ( 101 101 cd test && git checkout b6 102 102 ) >actual && 103 103 - test_i18ngrep "Your branch is up-to-date with .origin/master" actual 103 103 + test_i18ngrep "Your branch is up to date with .origin/master" actual 104 104 ' 105 105 106 106 test_expect_success 'status (diverged from upstream)' ' ··· 130 130 # reports nothing to commit 131 131 test_must_fail git commit --dry-run 132 132 ) >actual && 133 133 - test_i18ngrep "Your branch is up-to-date with .origin/master" actual 133 133 + test_i18ngrep "Your branch is up to date with .origin/master" actual 134 134 ' 135 135 136 136 cat >expect <<\EOF

+1 -1

templates/hooks--pre-rebase.sample

··· 58 58 not_in_topic=`git rev-list "^$topic" master` 59 59 if test -z "$not_in_topic" 60 60 then 61 61 - echo >&2 "$topic is already up-to-date with master" 61 61 + echo >&2 "$topic is already up to date with master" 62 62 exit 1 ;# we could allow it, but there is no point. 63 63 else 64 64 exit 0

+1 -1

unpack-trees.c

··· 163 163 msgs[ERROR_BIND_OVERLAP] = _("Entry '%s' overlaps with '%s'. Cannot bind."); 164 164 165 165 msgs[ERROR_SPARSE_NOT_UPTODATE_FILE] = 166 166 - _("Cannot update sparse checkout: the following entries are not up-to-date:\n%s"); 166 166 + _("Cannot update sparse checkout: the following entries are not up to date:\n%s"); 167 167 msgs[ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN] = 168 168 _("The following working tree files would be overwritten by sparse checkout update:\n%s"); 169 169 msgs[ERROR_WOULD_LOSE_ORPHANED_REMOVED] =