22e5e58a3c · matheusbsbs/matheus-bagliano

Documentation/RelNotes-1.5.6.3.txt

+1 -1

@@ -4,7 +4,7 @@ GIT v1.5.6.3 Release Notes

4 Fixes since v1.5.6.2

5 --------------------

6

7 -* Setting core.sharerepository to traditional "true" value was supposed to make

7 +* Setting core.sharedrepository to traditional "true" value was supposed to make

8 the repository group writable but should not affect permission for others.

9 However, since 1.5.6, it was broken to drop permission for others when umask is

10 022, making the repository unreadable by others.

Documentation/RelNotes-1.6.0.2.txt

+1 -1

@@ -17,7 +17,7 @@ Fixes since v1.6.0.1

17 * Many commands did not use the correct working tree location when used

18 with GIT_WORK_TREE environment settings.

19

20 -* Some systems needs to use compatibility fnmach and regex libraries

20 +* Some systems need to use compatibility fnmatch and regex libraries

21 independent from each other; the compat/ area has been reorganized to

22 allow this.

23

Documentation/RelNotes-1.6.4.3.txt

+1 -1

@@ -11,7 +11,7 @@ Fixes since v1.6.4.2

11 been deprecated.

12

13 * "git fetch" and "git clone" had an extra sanity check to verify the

14 - presense of the corresponding *.pack file before downloading *.idx

14 + presence of the corresponding *.pack file before downloading *.idx

15 file by issuing a HEAD request. Github server however sometimes

16 gave 500 (Internal server error) response to HEAD even if a GET

17 request for *.pack file to the same URL would have succeeded, and broke

Documentation/RelNotes-1.6.5.4.txt

+1 -1

@@ -26,7 +26,7 @@ Fixes since v1.6.5.3

26 future versions, but not in this release,

27

28 * "git merge -m <message> <branch>..." added the standard merge message

29 - on its own after user-supplied message, which should have overrided the

29 + on its own after user-supplied message, which should have overridden the

30 standard one.

31

32 Other minor documentation updates are included.

Documentation/RelNotes-1.6.5.7.txt

+1 -1

@@ -10,7 +10,7 @@ Fixes since v1.6.5.6

10 an older version of git should just ignore them. Instead we diagnosed

11 it as an error.

12

13 -* With help.autocorrect set to non-zero value, the logic to guess typoes

13 +* With help.autocorrect set to non-zero value, the logic to guess typos

14 in the subcommand name misfired and ran a random nonsense command.

15

16 * If a command is run with an absolute path as a pathspec inside a bare

Documentation/RelNotes-1.6.6.txt

+2 -2

@@ -29,7 +29,7 @@ or adjust to the new behaviour, on the day their sysadmin decides to install

29 the new version of git. When we switched from "git-foo" to "git foo" in

30 1.6.0, even though the change had been advertised and the transition

31 guide had been provided for a very long time, the users procrastinated

32 -during the entire transtion period, and ended up panicking on the day

32 +during the entire transition period, and ended up panicking on the day

33 their sysadmins updated their git installation. We are trying to avoid

34 repeating that unpleasantness in the 1.7.0 release.

35

@@ -94,7 +94,7 @@ users will fare this time.

94 * "git diff" traditionally treated various "ignore whitespace" options

95 only as a way to filter the patch output. "git diff --exit-code -b"

96 exited with non-zero status even if all changes were about changing the

97 - ammount of whitespace and nothing else. and "git diff -b" showed the

97 + amount of whitespace and nothing else. and "git diff -b" showed the

98 "diff --git" header line for such a change without patch text.

99

100 In 1.7.0, the "ignore whitespaces" will affect the semantics of the

Documentation/RelNotes-1.7.0.txt

+1 -1

@@ -202,7 +202,7 @@ release, unless otherwise noted.

202 the branch is fully merged to its upstream branch if it is not merged

203 to the current branch. It now deletes it in such a case.

204

205 - * "fiter-branch" command incorrectly said --prune-empty and --filter-commit

205 + * "filter-branch" command incorrectly said --prune-empty and --filter-commit

206 were incompatible; the latter should be read as --commit-filter.

207

208 * When using "git status" or asking "git diff" to compare the work tree

Documentation/howto/revert-a-faulty-merge.txt

+1 -1

@@ -229,7 +229,7 @@ reverting W. Mainline's history would look like this:

229 A---B---C

230

231 But if you don't actually need to change commit A, then you need some way to

232 -recreate it as a new commit with the same changes in it. The rebase commmand's

232 +recreate it as a new commit with the same changes in it. The rebase command's

233 --no-ff option provides a way to do this:

234

235 $ git rebase [-i] --no-ff P

builtin/blame.c

+2 -2

@@ -2376,11 +2376,11 @@ parse_done:

2376 *

2377 * The remaining are:

2378 *

2379 - * (1) if dashdash_pos != 0, its either

2379 + * (1) if dashdash_pos != 0, it is either

2380 * "blame [revisions] -- <path>" or

2381 * "blame -- <path> <rev>"

2382 *

2383 - * (2) otherwise, its one of the two:

2383 + * (2) otherwise, it is one of the two:

2384 * "blame [revisions] <path>"

2385 * "blame <path> <rev>"

2386 *

compat/mingw.c

+1 -1

@@ -641,7 +641,7 @@ static char *lookup_prog(const char *dir, const char *cmd, int isexe, int exe_on

641 }

642

643 /*

644 - * Determines the absolute path of cmd using the the split path in path.

644 + * Determines the absolute path of cmd using the split path in path.

645 * If cmd contains a slash or backslash, no lookup is performed.

646 */

647 static char *path_lookup(const char *cmd, char **path, int exe_only)

compat/nedmalloc/malloc.c.h

+1 -1

@@ -2069,7 +2069,7 @@ static void init_malloc_global_mutex() {

2069 Each freshly allocated chunk must have both cinuse and pinuse set.

2070 That is, each allocated chunk borders either a previously allocated

2071 and still in-use chunk, or the base of its memory arena. This is

2072 - ensured by making all allocations from the the `lowest' part of any

2072 + ensured by making all allocations from the `lowest' part of any

2073 found chunk. Further, no free chunk physically borders another one,

2074 so each free chunk is known to be preceded and followed by either

2075 inuse chunks or the ends of memory.

compat/regex/regex.c

+1 -1

@@ -3122,7 +3122,7 @@ re_match (bufp, string, size, pos, regs)

3122

3123

3124 /* re_match_2 matches the compiled pattern in BUFP against the

3125 - the (virtual) concatenation of STRING1 and STRING2 (of length SIZE1

3125 + (virtual) concatenation of STRING1 and STRING2 (of length SIZE1

3126 and SIZE2, respectively). We start matching at POS, and stop

3127 matching at STOP.

3128

contrib/workdir/git-new-workdir

+2 -2

@@ -54,13 +54,13 @@ then

54 die "destination directory '$new_workdir' already exists."

55 fi

56

57 -# make sure the the links use full paths

57 +# make sure the links use full paths

58 git_dir=$(cd "$git_dir"; pwd)

59

60 # create the workdir

61 mkdir -p "$new_workdir/.git" || die "unable to create \"$new_workdir\"!"

62

63 -# create the links to the original repo. explictly exclude index, HEAD and

63 +# create the links to the original repo. explicitly exclude index, HEAD and

64 # logs/HEAD from the list since they are purely related to the current working

65 # directory, and should not be shared.

66 for x in config refs logs/refs objects info hooks packed-refs remotes rr-cache svn

gitweb/README

+2 -2

@@ -95,7 +95,7 @@ You can specify the following configuration variables when building GIT:

95 in the browser's URL bar and next to site name in bookmarks). Relative

96 to base URI of gitweb. [Default: static/git-favicon.png]

97 * GITWEB_JS

98 - Points to the localtion where you put gitweb.js on your web server

98 + Points to the location where you put gitweb.js on your web server

99 (or to be more generic URI of JavaScript code used by gitweb).

100 Relative to base URI of gitweb. [Default: static/gitweb.js (or

101 static/gitweb.min.js if JSMIN build variable is defined / JavaScript

@@ -233,7 +233,7 @@ not include variables usually directly set during build):

233 is false.

234 * $maxload

235 Used to set the maximum load that we will still respond to gitweb queries.

236 - If server load exceed this value then return "503 Service Unavaliable" error.

236 + If server load exceed this value then return "503 Service Unavailable" error.

237 Server load is taken to be 0 if gitweb cannot determine its value. Set it to

238 undefined value to turn it off. The default is 300.

239

gitweb/gitweb.perl

+6 -6

@@ -245,7 +245,7 @@ our %feature = (

245 # return value of feature-sub indicates if to enable specified feature

246 #

247 # if there is no 'sub' key (no feature-sub), then feature cannot be

248 - # overriden

248 + # overridden

249 #

250 # use gitweb_get_feature(<feature>) to retrieve the <feature> value

251 # (an array) or gitweb_check_feature(<feature>) to check if <feature>

@@ -1323,7 +1323,7 @@ sub esc_param {

1323 return $str;

1324 }

1325

1326 -# quote unsafe chars in whole URL, so some charactrs cannot be quoted

1326 +# quote unsafe chars in whole URL, so some characters cannot be quoted

1327 sub esc_url {

1328 my $str = shift;

1329 return undef unless defined $str;

@@ -3782,9 +3782,9 @@ sub git_print_authorship {

3782 }

3783

3784 # Outputs table rows containing the full author or committer information,

3785 -# in the format expected for 'commit' view (& similia).

3785 +# in the format expected for 'commit' view (& similar).

3786 # Parameters are a commit hash reference, followed by the list of people

3787 -# to output information for. If the list is empty it defalts to both

3787 +# to output information for. If the list is empty it defaults to both

3788 # author and committer.

3789 sub git_print_authorship_rows {

3790 my $co = shift;

@@ -4513,8 +4513,8 @@ sub git_patchset_body {

4513 print "</div>\n"; # class="patch"

4514 }

4515

4516 - # for compact combined (--cc) format, with chunk and patch simpliciaction

4517 - # patchset might be empty, but there might be unprocessed raw lines

4516 + # for compact combined (--cc) format, with chunk and patch simplification

4517 + # the patchset might be empty, but there might be unprocessed raw lines

4518 for (++$patch_idx if $patch_number > 0;

4519 $patch_idx < @$difftree;

4520 ++$patch_idx) {

graph.c

+1 -1

@@ -439,7 +439,7 @@ static void graph_update_width(struct git_graph *graph,

439 max_cols++;

440

441 /*

442 - * We added a column for the the current commit as part of

442 + * We added a column for the current commit as part of

443 * graph->num_parents. If the current commit was already in

444 * graph->columns, then we have double counted it.

445 */

pack-check.c

+1 -1

@@ -77,7 +77,7 @@ static int verify_packfile(struct packed_git *p,

77 err = error("%s SHA1 checksum mismatch",

78 p->pack_name);

79 if (hashcmp(index_base + index_size - 40, pack_sig))

80 - err = error("%s SHA1 does not match its inddex",

80 + err = error("%s SHA1 does not match its index",

81 p->pack_name);

82 unuse_pack(w_curs);

83

Typos in code comments, an error message, documentation