many small typofixes

Signed-off-by: Ondřej Bílka <neleai@seznam.cz>
Reviewed-by: Marc Branchaud <marcnarc@xiplink.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/howto/new-command.txt b/Documentation/howto/new-command.txt
index 2abc3a0a0e7bc60c40211ce630fdb098848f825e..d7de5a3e9ed236c87a62b577ee5978e02d855a2a 100644 (file)
--- a/Documentation/howto/new-command.txt
+++ b/Documentation/howto/new-command.txt
@@ -94,7 +94,7 @@ your language, document it in the INSTALL file.
 6. There is a file command-list.txt in the distribution main directory
 that categorizes commands by type, so they can be listed in appropriate
 subsections in the documentation's summary command list.  Add an entry
 6. There is a file command-list.txt in the distribution main directory
 that categorizes commands by type, so they can be listed in appropriate
 subsections in the documentation's summary command list.  Add an entry

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

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

diff --git a/Documentation/technical/api-revision-walking.txt b/Documentation/technical/api-revision-walking.txt
index b7d0d9a8a7b45f4988c0ee8170fec25c415cc918..55b878ade81e2b3b265032e281f82ab86016d5ae 100644 (file)
--- a/Documentation/technical/api-revision-walking.txt
+++ b/Documentation/technical/api-revision-walking.txt
@@ -59,7 +59,7 @@ function.
 `reset_revision_walk`::
 
        Reset the flags used by the revision walking api. You can use
 `reset_revision_walk`::
 
        Reset the flags used by the revision walking api. You can use

-       this to do multiple sequencial revision walks.
+       this to do multiple sequential revision walks.

 
 Data structures
 ---------------
 
 Data structures
 ---------------

diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index d1d68e9fc62889f647aff0005cc2ca2d3fef9d94..8e19058744756e9978eac6244156ed1c27f1e20e 100644 (file)
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -379,7 +379,7 @@ static void handle_tag(const char *name, struct tag *tag)
        int tagged_mark;
        struct commit *p;
 
        int tagged_mark;
        struct commit *p;
 

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

         * to output tags of trees, tags of tags of trees, etc.  Simply omit
         * such tags.
         */
         * to output tags of trees, tags of tags of trees, etc.  Simply omit
         * such tags.
         */

diff --git a/builtin/push.c b/builtin/push.c
index 6d36c24268bea3cb658a1aa94f3a037f403d5895..04f0eaf179044dce1e87137978bcbecca18f3527 100644 (file)
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -92,7 +92,7 @@ static NORETURN int die_push_simple(struct branch *branch, struct remote *remote
        if (!short_upstream)
                short_upstream = branch->merge[0]->src;
        /*
        if (!short_upstream)
                short_upstream = branch->merge[0]->src;
        /*

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

         * push.default.
         */
        if (push_default == PUSH_DEFAULT_UNSPECIFIED)
         * push.default.
         */
        if (push_default == PUSH_DEFAULT_UNSPECIFIED)

diff --git a/cache.h b/cache.h
index 4c606ce28bcd59956a47b2881436047bc7a5ed90..561b728676f8d63cbd78a15eaa4b2634704215d9 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -491,7 +491,7 @@ extern void *read_blob_data_from_index(struct index_state *, const char *, unsig
 extern int ie_match_stat(const struct index_state *, const struct cache_entry *, struct stat *, unsigned int);
 extern int ie_modified(const struct index_state *, const struct cache_entry *, struct stat *, unsigned int);
 
 extern int ie_match_stat(const struct index_state *, const struct cache_entry *, struct stat *, unsigned int);
 extern int ie_modified(const struct index_state *, const struct cache_entry *, struct stat *, unsigned int);
 

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

 
 struct pathspec {
        const char **raw; /* get_pathspec() result, not freed by free_pathspec() */
 
 struct pathspec {
        const char **raw; /* get_pathspec() result, not freed by free_pathspec() */

diff --git a/combine-diff.c b/combine-diff.c
index 6dc06093d3c1eb6f3ab7a9cc79f0f192e16dc617..88525b37cf461ee922b81fd6848be5efc8e34542 100644 (file)
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -165,7 +165,7 @@ static struct lline *coalesce_lines(struct lline *base, int *lenbase,
 
        /*
         * Coalesce new lines into base by finding the LCS
 
        /*
         * Coalesce new lines into base by finding the LCS

-        * - Create the table to run dynamic programing
+        * - Create the table to run dynamic programming

         * - Compute the LCS
         * - Then reverse read the direction structure:
         *   - If we have MATCH, assign parent to base flag, and consume
         * - Compute the LCS
         * - Then reverse read the direction structure:
         *   - If we have MATCH, assign parent to base flag, and consume

diff --git a/contrib/ciabot/ciabot.py b/contrib/ciabot/ciabot.py
index 36b5665ff81af1d52be5e926b029452d3e838c35..befa0c39679aab55b5537b187ed0996914697f40 100755 (executable)
--- a/contrib/ciabot/ciabot.py
+++ b/contrib/ciabot/ciabot.py
@@ -70,7 +70,7 @@
 
 # The template used to generate the XML messages to CIA.  You can make
 # visible changes to the IRC-bot notification lines by hacking this.
 
 # The template used to generate the XML messages to CIA.  You can make
 # visible changes to the IRC-bot notification lines by hacking this.

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

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

diff --git a/contrib/ciabot/ciabot.sh b/contrib/ciabot/ciabot.sh
index 3fbbc534ae668b979132f6df60c936314917d1f0..dfb71a1a15a8653152d8328e78695f58cf32c43d 100755 (executable)
--- a/contrib/ciabot/ciabot.sh
+++ b/contrib/ciabot/ciabot.sh
@@ -39,7 +39,7 @@
 #       done
 #
 # The reason for the tac call is that git rev-list emits commits from
 #       done
 #
 # The reason for the tac call is that git rev-list emits commits from

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

 #
 # Configuration variables affecting this script:
 #
 #
 # Configuration variables affecting this script:
 #


@@ -64,7 +64,7 @@
 # down. It is unknown whether this is still an issue in 2010, but
 # XML-RPC would be annoying to do from sh in any case. (XML-RPC does
 # have the advantage that it guarantees notification of multiple commits
 # down. It is unknown whether this is still an issue in 2010, but
 # XML-RPC would be annoying to do from sh in any case. (XML-RPC does
 # have the advantage that it guarantees notification of multiple commits

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

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

diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt
index 7ba853eeda96ec9a4b4a3b4ebb8c88dda055c67d..e0957eee55d7fb4a530717d1ced39bcabb2057b2 100644 (file)
--- a/contrib/subtree/git-subtree.txt
+++ b/contrib/subtree/git-subtree.txt
@@ -270,7 +270,7 @@ git-extensions repository in ~/git-extensions/:
 name
 
 You can omit the --squash flag, but doing so will increase the number
 name
 
 You can omit the --squash flag, but doing so will increase the number

-of commits that are incldued in your local repository.
+of commits that are included in your local repository.

 
 We now have a ~/git-extensions/git-subtree directory containing code
 from the master branch of git://github.com/apenwarr/git-subtree.git
 
 We now have a ~/git-extensions/git-subtree directory containing code
 from the master branch of git://github.com/apenwarr/git-subtree.git

diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 6a721064c288609fde50fc84e963519ceb00723e..feee6a4a0d3a970c94fe506070ddc497c4b40658 100644 (file)
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -144,7 +144,7 @@ setup_user_tool () {
 setup_tool () {
        tool="$1"
 
 setup_tool () {
        tool="$1"
 

-       # Fallback definitions, to be overriden by tools.
+       # Fallback definitions, to be overridden by tools.

        can_merge () {
                return 0
        }
        can_merge () {
                return 0
        }

diff --git a/git-p4.py b/git-p4.py
index 88fcf232e5739b14a60f8b2c2a45add4a48e764b..31e71ff8b248339749bbcd045acdf602a1a21463 100755 (executable)
--- a/git-p4.py
+++ b/git-p4.py
@@ -1786,7 +1786,7 @@ def run(self, args):
             missingGitTags = gitTags - p4Labels
             self.exportGitTags(missingGitTags)
 
             missingGitTags = gitTags - p4Labels
             self.exportGitTags(missingGitTags)
 

-        # exit with error unless everything applied perfecly
+        # exit with error unless everything applied perfectly

         if len(commits) != len(applied):
                 sys.exit(1)
 
         if len(commits) != len(applied):
                 sys.exit(1)
 

diff --git a/notes.h b/notes.h
index 3324c486a1a106053621ff215f5689cf1d92af74..2a3f92338076ef8e4b8238aaf570c3273b0f28f0 100644 (file)
--- a/notes.h
+++ b/notes.h
@@ -77,7 +77,7 @@ const char *default_notes_ref(void);
  * variable is used, and if that is missing, the default notes ref is used
  * ("refs/notes/commits").
  *
  * variable is used, and if that is missing, the default notes ref is used
  * ("refs/notes/commits").
  *

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

  * one notes ref to another), you must first de-initialize the notes_tree
  * structure by calling free_notes(struct notes_tree *).
  *
  * one notes ref to another), you must first de-initialize the notes_tree
  * structure by calling free_notes(struct notes_tree *).
  *

diff --git a/read-cache.c b/read-cache.c
index d4474eab7b6f9ffbfb4e7da23d284c936f488276..c3d5e3543fae75c81a7a0a00c48bb0076675a2f1 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -489,7 +489,7 @@ int remove_index_entry_at(struct index_state *istate, int pos)
 }
 
 /*
 }
 
 /*

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

  * CE_REMOVE is set in ce_flags.  This is much more effective than
  * calling remove_index_entry_at() for each entry to be removed.
  */
  * CE_REMOVE is set in ce_flags.  This is much more effective than
  * calling remove_index_entry_at() for each entry to be removed.
  */


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

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

  */
 void update_index_if_able(struct index_state *istate, struct lock_file *lockfile)
 {
  */
 void update_index_if_able(struct index_state *istate, struct lock_file *lockfile)
 {

diff --git a/t/gitweb-lib.sh b/t/gitweb-lib.sh
index ae2dc4604f708d320d88d4f99ca9d575d88b6124..9e381e000f6cbece882dec43d2a3dbab3d18a983 100644 (file)
--- a/t/gitweb-lib.sh
+++ b/t/gitweb-lib.sh
@@ -36,7 +36,7 @@ EOF
 
        # You can set the GITWEB_TEST_INSTALLED environment variable to
        # the gitwebdir (the directory where gitweb is installed / deployed to)
 
        # You can set the GITWEB_TEST_INSTALLED environment variable to
        # the gitwebdir (the directory where gitweb is installed / deployed to)

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

        # or simply to pathname of installed gitweb script.
        if test -n "$GITWEB_TEST_INSTALLED" ; then
                if test -d $GITWEB_TEST_INSTALLED; then
        # or simply to pathname of installed gitweb script.
        if test -n "$GITWEB_TEST_INSTALLED" ; then
                if test -d $GITWEB_TEST_INSTALLED; then

diff --git a/t/lib-t6000.sh b/t/lib-t6000.sh
index 4ffd90127edb360142e492f6562c3c15c002d286..3f2d873fec9ed9e98b787cd708cd9e8e816e7573 100644 (file)
--- a/t/lib-t6000.sh
+++ b/t/lib-t6000.sh
@@ -34,7 +34,7 @@ save_tag () {
        mv sed.script.tmp sed.script
 }
 
        mv sed.script.tmp sed.script
 }
 

-# Replace unhelpful sha1 hashses with their symbolic equivalents
+# Replace unhelpful sha1 hashes with their symbolic equivalents

 entag () {
        sed -f sed.script
 }
 entag () {
        sed -f sed.script
 }

diff --git a/t/t7601-merge-pull-config.sh b/t/t7601-merge-pull-config.sh
index 25dac798894f6a3cb4b62c8b9ba944bfc1d82d9f..830a4c3e9dffc7963dda03139be6c4e66fddf10f 100755 (executable)
--- a/t/t7601-merge-pull-config.sh
+++ b/t/t7601-merge-pull-config.sh
@@ -109,7 +109,7 @@ test_expect_success 'setup conflicted merge' '
 '
 
 # First do the merge with resolve and recursive then verify that
 '
 
 # First do the merge with resolve and recursive then verify that

-# recusive is chosen.
+# recursive is chosen.

 
 test_expect_success 'merge picks up the best result' '
        git config --unset-all pull.twohead &&
 
 test_expect_success 'merge picks up the best result' '
        git config --unset-all pull.twohead &&

diff --git a/t/t9020-remote-svn.sh b/t/t9020-remote-svn.sh
index d9f6b73ab001c4105cf336e213978807d8acf864..4d81ba1c2c43bfe14cb329967ccf2c97b90a4848 100755 (executable)
--- a/t/t9020-remote-svn.sh
+++ b/t/t9020-remote-svn.sh
@@ -24,7 +24,7 @@ init_git () {
        rm -fr .git &&
        git init &&
        #git remote add svnsim testsvn::sim:///$TEST_DIRECTORY/t9020/example.svnrdump
        rm -fr .git &&
        git init &&
        #git remote add svnsim testsvn::sim:///$TEST_DIRECTORY/t9020/example.svnrdump

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

        git remote add svnsim testsvn::sim://$TEST_DIRECTORY/t9154/svn.dump
        git remote add svnfile testsvn::file://$TEST_DIRECTORY/t9154/svn.dump
 }
        git remote add svnsim testsvn::sim://$TEST_DIRECTORY/t9154/svn.dump
        git remote add svnfile testsvn::file://$TEST_DIRECTORY/t9154/svn.dump
 }

diff --git a/t/t9112-git-svn-md5less-file.sh b/t/t9112-git-svn-md5less-file.sh
index a61d6716d294a460c195ca36d33a9bed17aa5e33..9861c719f8c5e3fbe5b626e5fdf1ebf83156086c 100755 (executable)
--- a/t/t9112-git-svn-md5less-file.sh
+++ b/t/t9112-git-svn-md5less-file.sh
@@ -7,7 +7,7 @@ test_description='test that git handles an svn repository with missing md5sums'
 # Loading a node from a svn dumpfile without a Text-Content-Length
 # field causes svn to neglect to store or report an md5sum.  (it will
 # calculate one if you had put Text-Content-Length: 0).  This showed
 # Loading a node from a svn dumpfile without a Text-Content-Length
 # field causes svn to neglect to store or report an md5sum.  (it will
 # calculate one if you had put Text-Content-Length: 0).  This showed

-# up in a repository creted with cvs2svn.
+# up in a repository created with cvs2svn.

 
 cat > dumpfile.svn <<EOF
 SVN-fs-dump-format-version: 1
 
 cat > dumpfile.svn <<EOF
 SVN-fs-dump-format-version: 1

diff --git a/t/t9802-git-p4-filetype.sh b/t/t9802-git-p4-filetype.sh
index b0d1d94bf417a7c3cdd4f1b07334416aacbee18d..a82744bab072114675dea66fa94f21f661aa8dbd 100755 (executable)
--- a/t/t9802-git-p4-filetype.sh
+++ b/t/t9802-git-p4-filetype.sh
@@ -28,7 +28,7 @@ test_expect_success 'p4 client newlines, unix' '
                test_cmp f-unix-orig f-unix &&
 
                # make sure stored in repo as unix newlines
                test_cmp f-unix-orig f-unix &&
 
                # make sure stored in repo as unix newlines

-               # use sed to eat python-appened newline
+               # use sed to eat python-appended newline

                p4 -G print //depot/f-unix | marshal_dump data 2 |\
                    sed \$d >f-unix-p4-print &&
                test_cmp f-unix-orig f-unix-p4-print &&
                p4 -G print //depot/f-unix | marshal_dump data 2 |\
                    sed \$d >f-unix-p4-print &&
                test_cmp f-unix-orig f-unix-p4-print &&

diff --git a/transport-helper.c b/transport-helper.c
index 45a35df66e09984c6db9fb86a35ece552a1cbcb1..63cabc37e37dd338d3d9ee0764f099840d937600 100644 (file)
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -1132,7 +1132,7 @@ static void *udt_copy_task_routine(void *udt)
 #ifndef NO_PTHREADS
 
 /*
 #ifndef NO_PTHREADS
 
 /*

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

  * thread (for error messages). Returns 0 on success, 1 on failure.
  */
 static int tloop_join(pthread_t thread, const char *name)
  * thread (for error messages). Returns 0 on success, 1 on failure.
  */
 static int tloop_join(pthread_t thread, const char *name)


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

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

  * process (for error messages). Returns 0 on success, 1 on failure.
  */
 static int tloop_join(pid_t pid, const char *name)
  * process (for error messages). Returns 0 on success, 1 on failure.
  */
 static int tloop_join(pid_t pid, const char *name)