98e023dea4 · matheusbsbs/matheus-bagliano

Documentation/howto/new-command.txt

+1 -1

@@ -94,7 +94,7 @@ your language, document it in the INSTALL file.

94 6. There is a file command-list.txt in the distribution main directory

95 that categorizes commands by type, so they can be listed in appropriate

96 subsections in the documentation's summary command list. Add an entry

97 -for yours. To understand the categories, look at git-cmmands.txt

97 +for yours. To understand the categories, look at git-commands.txt

98 in the main directory.

99

100 7. Give the maintainer one paragraph to include in the RelNotes file

Documentation/technical/api-revision-walking.txt

+1 -1

@@ -59,7 +59,7 @@ function.

59 `reset_revision_walk`::

60

61 Reset the flags used by the revision walking api. You can use

62 - this to do multiple sequencial revision walks.

62 + this to do multiple sequential revision walks.

63

64 Data structures

65 ---------------

builtin/fast-export.c

+1 -1

@@ -379,7 +379,7 @@ static void handle_tag(const char *name, struct tag *tag)

379 int tagged_mark;

380 struct commit *p;

381

382 - /* Trees have no identifer in fast-export output, thus we have no way

382 + /* Trees have no identifier in fast-export output, thus we have no way

383 * to output tags of trees, tags of tags of trees, etc. Simply omit

384 * such tags.

385 */

builtin/push.c

+1 -1

@@ -92,7 +92,7 @@ static NORETURN int die_push_simple(struct branch *branch, struct remote *remote

92 if (!short_upstream)

93 short_upstream = branch->merge[0]->src;

94 /*

95 - * Don't show advice for people who explicitely set

95 + * Don't show advice for people who explicitly set

96 * push.default.

97 */

98 if (push_default == PUSH_DEFAULT_UNSPECIFIED)

cache.h

+1 -1

@@ -491,7 +491,7 @@ extern void *read_blob_data_from_index(struct index_state *, const char *, unsig

491 extern int ie_match_stat(const struct index_state *, const struct cache_entry *, struct stat *, unsigned int);

492 extern int ie_modified(const struct index_state *, const struct cache_entry *, struct stat *, unsigned int);

493

494 -#define PATHSPEC_ONESTAR 1 /* the pathspec pattern sastisfies GFNM_ONESTAR */

494 +#define PATHSPEC_ONESTAR 1 /* the pathspec pattern satisfies GFNM_ONESTAR */

495

496 struct pathspec {

497 const char **raw; /* get_pathspec() result, not freed by free_pathspec() */

combine-diff.c

+1 -1

@@ -165,7 +165,7 @@ static struct lline *coalesce_lines(struct lline *base, int *lenbase,

165

166 /*

167 * Coalesce new lines into base by finding the LCS

168 - * - Create the table to run dynamic programing

168 + * - Create the table to run dynamic programming

169 * - Compute the LCS

170 * - Then reverse read the direction structure:

171 * - If we have MATCH, assign parent to base flag, and consume

contrib/ciabot/ciabot.py

+1 -1

@@ -70,7 +70,7 @@ tinyifier = "http://tinyurl.com/api-create.php?url="

70

71 # The template used to generate the XML messages to CIA. You can make

72 # visible changes to the IRC-bot notification lines by hacking this.

73 -# The default will produce a notfication line that looks like this:

73 +# The default will produce a notification line that looks like this:

74 #

75 # ${project}: ${author} ${repo}:${branch} * ${rev} ${files}: ${logmsg} ${url}

76 #

contrib/ciabot/ciabot.sh

+2 -2

@@ -39,7 +39,7 @@

39 # done

40 #

41 # The reason for the tac call is that git rev-list emits commits from

42 -# most recent to least - better to ship notifactions from oldest to newest.

42 +# most recent to least - better to ship notifications from oldest to newest.

43 #

44 # Configuration variables affecting this script:

45 #

@@ -64,7 +64,7 @@

64 # down. It is unknown whether this is still an issue in 2010, but

65 # XML-RPC would be annoying to do from sh in any case. (XML-RPC does

66 # have the advantage that it guarantees notification of multiple commits

67 -# shpped from an update in their actual order.)

67 +# shipped from an update in their actual order.)

68 #

69

70 # The project as known to CIA. You can set this with a -p option,

contrib/subtree/git-subtree.txt

+1 -1

@@ -270,7 +270,7 @@ git-extensions repository in ~/git-extensions/:

270 name

271

272 You can omit the --squash flag, but doing so will increase the number

273 -of commits that are incldued in your local repository.

273 +of commits that are included in your local repository.

274

275 We now have a ~/git-extensions/git-subtree directory containing code

276 from the master branch of git://github.com/apenwarr/git-subtree.git

git-mergetool--lib.sh

+1 -1

@@ -144,7 +144,7 @@ setup_user_tool () {

144 setup_tool () {

145 tool="$1"

146

147 - # Fallback definitions, to be overriden by tools.

147 + # Fallback definitions, to be overridden by tools.

148 can_merge () {

149 return 0

150 }

git-p4.py

+1 -1

@@ -1786,7 +1786,7 @@ class P4Submit(Command, P4UserMap):

1786 missingGitTags = gitTags - p4Labels

1787 self.exportGitTags(missingGitTags)

1788

1789 - # exit with error unless everything applied perfecly

1789 + # exit with error unless everything applied perfectly

1790 if len(commits) != len(applied):

1791 sys.exit(1)

1792

notes.h

+1 -1

@@ -77,7 +77,7 @@ const char *default_notes_ref(void);

77 * variable is used, and if that is missing, the default notes ref is used

78 * ("refs/notes/commits").

79 *

80 - * If you need to re-intialize a notes_tree structure (e.g. when switching from

80 + * If you need to re-initialize a notes_tree structure (e.g. when switching from

81 * one notes ref to another), you must first de-initialize the notes_tree

82 * structure by calling free_notes(struct notes_tree *).

83 *

read-cache.c

+2 -2

@@ -489,7 +489,7 @@ int remove_index_entry_at(struct index_state *istate, int pos)

489 }

490

491 /*

492 - * Remove all cache ententries marked for removal, that is where

492 + * Remove all cache entries marked for removal, that is where

493 * CE_REMOVE is set in ce_flags. This is much more effective than

494 * calling remove_index_entry_at() for each entry to be removed.

495 */

@@ -1760,7 +1760,7 @@ static int has_racy_timestamp(struct index_state *istate)

1760 }

1761

1762 /*

1763 - * Opportunisticly update the index but do not complain if we can't

1763 + * Opportunistically update the index but do not complain if we can't

1764 */

1765 void update_index_if_able(struct index_state *istate, struct lock_file *lockfile)

1766 {

t/gitweb-lib.sh

+1 -1

@@ -36,7 +36,7 @@ EOF

36

37 # You can set the GITWEB_TEST_INSTALLED environment variable to

38 # the gitwebdir (the directory where gitweb is installed / deployed to)

39 - # of an existing gitweb instalation to test that installation,

39 + # of an existing gitweb installation to test that installation,

40 # or simply to pathname of installed gitweb script.

41 if test -n "$GITWEB_TEST_INSTALLED" ; then

42 if test -d $GITWEB_TEST_INSTALLED; then

t/lib-t6000.sh

+1 -1

@@ -34,7 +34,7 @@ save_tag () {

34 mv sed.script.tmp sed.script

35 }

36

37 -# Replace unhelpful sha1 hashses with their symbolic equivalents

37 +# Replace unhelpful sha1 hashes with their symbolic equivalents

38 entag () {

39 sed -f sed.script

40 }

t/t7601-merge-pull-config.sh

+1 -1

@@ -109,7 +109,7 @@ test_expect_success 'setup conflicted merge' '

109 '

110

111 # First do the merge with resolve and recursive then verify that

112 -# recusive is chosen.

112 +# recursive is chosen.

113

114 test_expect_success 'merge picks up the best result' '

115 git config --unset-all pull.twohead &&

t/t9020-remote-svn.sh

+1 -1

@@ -24,7 +24,7 @@ init_git () {

24 rm -fr .git &&

25 git init &&

26 #git remote add svnsim testsvn::sim:///$TEST_DIRECTORY/t9020/example.svnrdump

27 - # let's reuse an exisiting dump file!?

27 + # let's reuse an existing dump file!?

28 git remote add svnsim testsvn::sim://$TEST_DIRECTORY/t9154/svn.dump

29 git remote add svnfile testsvn::file://$TEST_DIRECTORY/t9154/svn.dump

30 }

t/t9112-git-svn-md5less-file.sh

+1 -1

@@ -7,7 +7,7 @@ test_description='test that git handles an svn repository with missing md5sums'

7 # Loading a node from a svn dumpfile without a Text-Content-Length

8 # field causes svn to neglect to store or report an md5sum. (it will

9 # calculate one if you had put Text-Content-Length: 0). This showed

10 -# up in a repository creted with cvs2svn.

10 +# up in a repository created with cvs2svn.

11

12 cat > dumpfile.svn <<EOF

13 SVN-fs-dump-format-version: 1

t/t9802-git-p4-filetype.sh

+1 -1

@@ -28,7 +28,7 @@ test_expect_success 'p4 client newlines, unix' '

28 test_cmp f-unix-orig f-unix &&

29

30 # make sure stored in repo as unix newlines

31 - # use sed to eat python-appened newline

31 + # use sed to eat python-appended newline

32 p4 -G print //depot/f-unix | marshal_dump data 2 |\

33 sed \$d >f-unix-p4-print &&

34 test_cmp f-unix-orig f-unix-p4-print &&

transport-helper.c

+2 -2

@@ -1132,7 +1132,7 @@ static void *udt_copy_task_routine(void *udt)

1132 #ifndef NO_PTHREADS

1133

1134 /*

1135 - * Join thread, with apporiate errors on failure. Name is name for the

1135 + * Join thread, with appropriate errors on failure. Name is name for the

1136 * thread (for error messages). Returns 0 on success, 1 on failure.

1137 */

1138 static int tloop_join(pthread_t thread, const char *name)

@@ -1198,7 +1198,7 @@ static void udt_kill_transfer(struct unidirectional_transfer *t)

1198 }

1199

1200 /*

1201 - * Join process, with apporiate errors on failure. Name is name for the

1201 + * Join process, with appropriate errors on failure. Name is name for the

1202 * process (for error messages). Returns 0 on success, 1 on failure.

1203 */

1204 static int tloop_join(pid_t pid, const char *name)

many small typofixes