7560f547e6 · matheusbsbs/matheus-bagliano

Documentation/git-apply.txt

+2 -2

@@ -66,7 +66,7 @@ OPTIONS

66 disables it is in effect), make sure the patch is

67 applicable to what the current index file records. If

68 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

70 causes the index file to be updated.

71

72 --cached::

@@ -259,7 +259,7 @@ treats these changes as follows.

259 If `--index` is specified (explicitly or implicitly), then the submodule

260 commits must match the index exactly for the patch to apply. If any

261 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

263 are not updated.

264

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

Documentation/git-cvsserver.txt

+1 -1

@@ -223,7 +223,7 @@ access method and requested operation.

223 That means that even if you offer only read access (e.g. by using

224 the pserver method), 'git-cvsserver' should have write access to

225 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).

227

228 By default it uses SQLite databases in the Git directory, named

229 `gitcvs.<module_name>.sqlite`. Note that the SQLite backend creates

Documentation/git-diff-index.txt

+3 -3

@@ -85,7 +85,7 @@ a 'git write-tree' + 'git diff-tree'. Thus that's the default mode.

85 The non-cached version asks the question:

86

87 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

89

90 which is obviously a very useful question too, since that tells you what

91 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

100 torvalds@ppc970:~/v2.6/linux> git diff-index --abbrev HEAD

101 :100644 100664 7476bb... 000000... kernel/sched.c

102

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

105 get the real diff, you need to look at the object in the working directory

106 directly rather than do an object-to-object diff.

107

Documentation/git-merge.txt

+1 -1

@@ -133,7 +133,7 @@ exception is when the changed index entries are in the state that

133 would result from the merge already.)

134

135 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."

137

138 FAST-FORWARD MERGE

139 ------------------

Documentation/git-rebase.txt

+1 -1

@@ -334,7 +334,7 @@ which makes little sense.

334

335 -f::

336 --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

338 the command without `--force` would return without doing anything.

339 +

340 You may find this (or --no-ff with an interactive rebase) helpful after

Documentation/git-rerere.txt

+1 -1

@@ -205,7 +205,7 @@ development on the topic branch:

205 ------------

206

207 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.

209 This would result in falling back to a three-way merge, and it

210 would conflict the same way as the test merge you resolved earlier.

211 'git rerere' will be run by 'git rebase' to help you resolve this

Documentation/git-rm.txt

+1 -1

@@ -146,7 +146,7 @@ the submodule's history. If it exists the submodule.<name> section

146 in the linkgit:gitmodules[5] file will also be removed and that file

147 will be staged (unless --cached or -n are used).

148

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

150 recorded in the index, no tracked files are modified and no untracked

151 files that aren't ignored are present in the submodules work tree.

152 Ignored files are deemed expendable and won't stop a submodule's work

Documentation/git-svn.txt

+1 -1

@@ -424,7 +424,7 @@ Any other arguments are passed directly to 'git log'

424 'set-tree'::

425 You should consider using 'dcommit' instead of this command.

426 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

428 absolutely no attempts to do patching when committing to SVN, it

429 simply overwrites files with those specified in the tree or

430 commit. All merging is assumed to have taken place

Documentation/git-update-index.txt

+1 -1

@@ -214,7 +214,7 @@ will remove the intended effect of the option.

214 Using --refresh

215 ---------------

216 `--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

218 "re-match" the stat information of a file with the index, so that you

219 can refresh the index for a file that hasn't been changed but where

220 the stat entry is out of date.

Documentation/gitcore-tutorial.txt

+4 -4

@@ -631,7 +631,7 @@ So after you do a `cp -a` to create a new copy, you'll want to do

631 $ git update-index --refresh

632 ----------------

633 +

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.

635

636 Note that the second point is true even across machines. You can

637 duplicate a remote Git repository with *any* regular copy mechanism, be it

@@ -701,7 +701,7 @@ $ git checkout-index -u -a

701 ----------------

702

703 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

705 `-a` flag means "check out all files" (if you have a stale copy or an

706 older version of a checked out tree you may also need to add the `-f`

707 flag first, to tell 'git checkout-index' to *force* overwriting of any old

@@ -1283,7 +1283,7 @@ run a single command, 'git-receive-pack'.

1283

1284 First, you need to create an empty repository on the remote

1285 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

1287 into it later. Obviously, this repository creation needs to be

1288 done only once.

1289

@@ -1450,7 +1450,7 @@ transport protocols (HTTP), you need to keep this repository

1450 would contain a call to 'git update-server-info'

1451 but you need to manually enable the hook with

1452 `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.

1454

1455 3. Push into the public repository from your primary

1456 repository.

Documentation/githooks.txt

+1 -1

@@ -369,7 +369,7 @@ them.

369

370 When enabled, the default 'post-update' hook runs

371 'git update-server-info' to keep the information used by dumb

372 -transports (e.g., HTTP) up-to-date. If you are publishing

372 +transports (e.g., HTTP) up to date. If you are publishing

373 a Git repository that is accessible via HTTP, you should

374 probably enable this hook.

375

Documentation/gitrepository-layout.txt

+1 -1

@@ -71,7 +71,7 @@ objects/info/packs::

71 This file is to help dumb transports discover what packs

72 are available in this object store. Whenever a pack is

73 added or removed, `git update-server-info` should be run

74 - to keep this file up-to-date if the repository is

74 + to keep this file up to date if the repository is

75 published for dumb transports. 'git repack' does this

76 by default.

77

Documentation/gittutorial.txt

+1 -1

@@ -109,7 +109,7 @@ summary of the situation with 'git status':

109 $ git status

110 On branch master

111 Changes to be committed:

112 -Your branch is up-to-date with 'origin/master'.

112 +Your branch is up to date with 'origin/master'.

113 (use "git reset HEAD <file>..." to unstage)

114

115 modified: file1

Documentation/merge-options.txt

+1 -1

@@ -39,7 +39,7 @@ set to `no` at the beginning of them.

39

40 --ff-only::

41 Refuse to merge and exit with a non-zero status unless the

42 - current `HEAD` is already up-to-date or the merge can be

42 + current `HEAD` is already up to date or the merge can be

43 resolved as a fast-forward.

44

45 --log[=<n>]::

Documentation/technical/pack-protocol.txt

+1 -1

@@ -199,7 +199,7 @@ After reference and capabilities discovery, the client can decide to

199 terminate the connection by sending a flush-pkt, telling the server it can

200 now gracefully terminate, and disconnect, when it does not need any pack

201 data. This can happen with the ls-remote command, and also can happen when

202 -the client already is up-to-date.

202 +the client already is up to date.

203

204 Otherwise, it enters the negotiation phase, where the client and

205 server determine what the minimal packfile necessary for transport is,

Documentation/technical/trivial-merge.txt

+2 -2

@@ -32,7 +32,7 @@ or the result.

32 If multiple cases apply, the one used is listed first.

33

34 A result which changes the index is an error if the index is not empty

35 -and not up-to-date.

35 +and not up to date.

36

37 Entries marked '+' have stat information. Spaces marked '*' don't

38 affect the result.

@@ -65,7 +65,7 @@ empty, no entry is left for that stage). Otherwise, the given entry is

65 left in stage 0, and there are no other entries.

66

67 A result of "no merge" is an error if the index is not empty and not

68 -up-to-date.

68 +up to date.

69

70 *empty* means that the tree must not have a directory-file conflict

71 with the entry.

Documentation/user-manual.txt

+1 -1

@@ -2195,7 +2195,7 @@ $ cd work

2195 Linus's tree will be stored in the remote-tracking branch named origin/master,

2196 and can be updated using linkgit:git-fetch[1]; you can track other

2197 public trees using linkgit:git-remote[1] to set up a "remote" and

2198 -linkgit:git-fetch[1] to keep them up-to-date; see

2198 +linkgit:git-fetch[1] to keep them up to date; see

2199 <<repositories-and-branches>>.

2200

2201 Now create the branches in which you are going to work; these start out

builtin/merge.c

+2 -2

@@ -1345,7 +1345,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)

1345 * If head can reach all the merge then we are up to date.

1346 * but first the most common case of merging one remote.

1347 */

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

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

1349 goto done;

1350 } else if (fast_forward != FF_NO && !remoteheads->next &&

1351 !common->next &&

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

1428 }

1429 }

1430 if (up_to_date) {

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

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

1432 goto done;

1433 }

1434 }

contrib/examples/git-merge.sh

+2 -2

@@ -399,7 +399,7 @@ case "$allow_fast_forward,$#,$common,$no_commit" in

399 ?,1,"$1",*)

400 # If head can reach all the merge then we are up to date.

401 # but first the most common case of merging one remote.

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

402 + finish_up_to_date "Already up to date."

403 exit 0

404 ;;

405 t,1,"$head",*)

@@ -459,7 +459,7 @@ t,1,"$head",*)

459 done

460 if test "$up_to_date" = t

461 then

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

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

463 exit 0

464 fi

465 ;;

contrib/examples/git-resolve.sh

+1 -1

@@ -41,7 +41,7 @@ fi

41

42 case "$common" in

43 "$merge")

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

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

45 dropheads

46 exit 0

47 ;;

contrib/subtree/t/t7900-subtree.sh

+1 -1

@@ -253,7 +253,7 @@ test_expect_success 'merge the added subproj again, should do nothing' '

253 # this shouldn not actually do anything, since FETCH_HEAD

254 # is already a parent

255 result=$(git merge -s ours -m "merge -s -ours" FETCH_HEAD) &&

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

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

257 )

258 '

259

git-gui/po/README

+1 -1

@@ -165,7 +165,7 @@ to contribute an update. This may be because you would want to improve

165 the translation of existing messages, or because the git-gui software

166 itself was updated and there are new messages that need translation.

167

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

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

169

170 $ git checkout master

171 $ git pull

git-merge-octopus.sh

+1 -1

@@ -74,7 +74,7 @@ do

74

75 case "$LF$common$LF" in

76 *"$LF$SHA1$LF"*)

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

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

78 continue

79 ;;

80 esac

git-p4.py

+1 -1

@@ -3614,7 +3614,7 @@ class P4Rebase(Command):

3614

3615 def rebase(self):

3616 if os.system("git update-index --refresh") != 0:

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 + 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 if len(read_pipe("git diff-index HEAD --")) > 0:

3619 die("You have uncommitted changes. Please commit them before rebasing or stash them away with git stash.");

3620

merge-recursive.c

+1 -1

@@ -1927,7 +1927,7 @@ int merge_trees(struct merge_options *o,

1927 }

1928

1929 if (oid_eq(&common->object.oid, &merge->object.oid)) {

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

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

1931 *result = head;

1932 return 1;

1933 }

notes-merge.c

+1 -1

@@ -625,7 +625,7 @@ int notes_merge(struct notes_merge_options *o,

625 if (!oidcmp(&remote->object.oid, base_oid)) {

626 /* Already merged; result == local commit */

627 if (o->verbosity >= 2)

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

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

629 oidcpy(result_oid, &local->object.oid);

630 goto found_result;

631 }

remote.c

+1 -1

@@ -2080,7 +2080,7 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb)

2080 _(" (use \"git branch --unset-upstream\" to fixup)\n"));

2081 } else if (!ours && !theirs) {

2082 strbuf_addf(sb,

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

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

2084 base);

2085 } else if (!theirs) {

2086 strbuf_addf(sb,

t/t6040-tracking-info.sh

+2 -2

@@ -100,7 +100,7 @@ test_expect_success 'checkout (up-to-date with upstream)' '

100 (

101 cd test && git checkout b6

102 ) >actual &&

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

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

104 '

105

106 test_expect_success 'status (diverged from upstream)' '

@@ -130,7 +130,7 @@ test_expect_success 'status (up-to-date with upstream)' '

130 # reports nothing to commit

131 test_must_fail git commit --dry-run

132 ) >actual &&

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

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

134 '

135

136 cat >expect <<\EOF

templates/hooks--pre-rebase.sample

+1 -1

@@ -58,7 +58,7 @@ then

58 not_in_topic=`git rev-list "^$topic" master`

59 if test -z "$not_in_topic"

60 then

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

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

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

63 else

64 exit 0

unpack-trees.c

+1 -1

@@ -162,7 +162,7 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,

162 msgs[ERROR_BIND_OVERLAP] = _("Entry '%s' overlaps with '%s'. Cannot bind.");

163

164 msgs[ERROR_SPARSE_NOT_UPTODATE_FILE] =

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

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

166 msgs[ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN] =

167 _("The following working tree files would be overwritten by sparse checkout update:\n%s");

168 msgs[ERROR_WOULD_LOSE_ORPHANED_REMOVED] =

treewide: correct several "up-to-date" to "up to date"