thodg/libgit2

diff --git a/deps/http-parser/http_parser.c b/deps/http-parser/http_parser.c
index 2035302..c42e501 100644
--- a/deps/http-parser/http_parser.c
+++ b/deps/http-parser/http_parser.c
@@ -1569,7 +1569,7 @@ size_t http_parser_execute (http_parser *parser,
         /* Here we call the headers_complete callback. This is somewhat
          * different than other callbacks because if the user returns 1, we
          * will interpret that as saying that this message has no body. This
-         * is needed for the annoying case of recieving a response to a HEAD
+         * is needed for the annoying case of receiving a response to a HEAD
          * request.
          *
          * We'd like to use CALLBACK_NOTIFY_NOADVANCE() here but we cannot, so
diff --git a/deps/regex/regex.c b/deps/regex/regex.c
index 225a001..e1b4baf 100644
--- a/deps/regex/regex.c
+++ b/deps/regex/regex.c
@@ -20,7 +20,7 @@
 
 #include "config.h"
 
-/* Make sure noone compiles this code with a C++ compiler.  */
+/* Make sure no one compiles this code with a C++ compiler.  */
 #ifdef __cplusplus
 # error "This is C code, use a C compiler"
 #endif
diff --git a/examples/general.c b/examples/general.c
index 8981cac..706650b 100644
--- a/examples/general.c
+++ b/examples/general.c
@@ -126,7 +126,7 @@ int main (int argc, char** argv)
 
   // We can read raw objects directly from the object database if we have
   // the oid (SHA) of the object.  This allows us to access objects without
-  // knowing thier type and inspect the raw bytes unparsed.
+  // knowing their type and inspect the raw bytes unparsed.
   error = git_odb_read(&obj, odb, &oid);
   check_error(error, "finding object in repository");
 
@@ -402,7 +402,7 @@ int main (int argc, char** argv)
 
   // Now that we have the starting point pushed onto the walker, we start
   // asking for ancestors. It will return them in the sorting order we asked
-  // for as commit oids.  We can then lookup and parse the commited pointed
+  // for as commit oids.  We can then lookup and parse the committed pointed
   // at by the returned OID; note that this operation is specially fast
   // since the raw contents of the commit object will be cached in memory
   while ((git_revwalk_next(&oid, walk)) == 0) {
diff --git a/include/git2/branch.h b/include/git2/branch.h
index 8887810..43aa20f 100644
--- a/include/git2/branch.h
+++ b/include/git2/branch.h
@@ -244,7 +244,7 @@ GIT_EXTERN(int) git_branch_is_head(
 /**
  * Return the name of remote that the remote tracking branch belongs to.
  *
- * @param out Pointer to the user-allocated git_buf which will be filled iwth the name of the remote.
+ * @param out Pointer to the user-allocated git_buf which will be filled with the name of the remote.
  *
  * @param repo The repository where the branch lives.
  *
diff --git a/include/git2/buffer.h b/include/git2/buffer.h
index 1c216bf..9fc6a58 100644
--- a/include/git2/buffer.h
+++ b/include/git2/buffer.h
@@ -74,7 +74,7 @@ GIT_EXTERN(void) git_buf_free(git_buf *buffer);
 /**
  * Resize the buffer allocation to make more space.
  *
- * This will attempt to grow the buffer to accomodate the target size.
+ * This will attempt to grow the buffer to accommodate the target size.
  *
  * If the buffer refers to memory that was not allocated by libgit2 (i.e.
  * the `asize` field is zero), then `ptr` will be replaced with a newly
diff --git a/include/git2/config.h b/include/git2/config.h
index a4e20ed..1fd98b2 100644
--- a/include/git2/config.h
+++ b/include/git2/config.h
@@ -270,7 +270,7 @@ GIT_EXTERN(int) git_config_get_entry(
  *
  * All config files will be looked into, in the order of their
  * defined level. A higher level means a higher priority. The
- * first occurence of the variable will be returned here.
+ * first occurrence of the variable will be returned here.
  *
  * @param out pointer to the variable where the value should be stored
  * @param cfg where to look for the variable
diff --git a/include/git2/refs.h b/include/git2/refs.h
index e5bb15c..54a865e 100644
--- a/include/git2/refs.h
+++ b/include/git2/refs.h
@@ -58,7 +58,7 @@ GIT_EXTERN(int) git_reference_name_to_id(
  * Lookup a reference by DWIMing its short name
  *
  * Apply the git precendence rules to the given shorthand to determine
- * which reference the user is refering to.
+ * which reference the user is referring to.
  *
  * @param out pointer in which to store the reference
  * @param repo the repository in which to look
diff --git a/include/git2/remote.h b/include/git2/remote.h
index 4aabd94..56acf06 100644
--- a/include/git2/remote.h
+++ b/include/git2/remote.h
@@ -593,7 +593,7 @@ GIT_EXTERN(void) git_remote_set_autotag(
  *
  * @param problems non-default refspecs cannot be renamed and will be
  * stored here for further processing by the caller. Always free this
- * strarray on succesful return.
+ * strarray on successful return.
  * @param repo the repository in which to rename
  * @param name the current name of the reamote
  * @param new_name the new name the remote should bear
diff --git a/include/git2/submodule.h b/include/git2/submodule.h
index 616890d..8efc26e 100644
--- a/include/git2/submodule.h
+++ b/include/git2/submodule.h
@@ -148,7 +148,7 @@ GIT_EXTERN(void) git_submodule_free(git_submodule *submodule);
  * Iterate over all tracked submodules of a repository.
  *
  * See the note on `git_submodule` above.  This iterates over the tracked
- * submodules as decribed therein.
+ * submodules as described therein.
  *
  * If you are concerned about items in the working directory that look like
  * submodules but are not tracked, the diff API will generate a diff record
diff --git a/include/git2/sys/mempack.h b/include/git2/sys/mempack.h
index d3bc87b..96074fb 100644
--- a/include/git2/sys/mempack.h
+++ b/include/git2/sys/mempack.h
@@ -47,7 +47,7 @@ int git_mempack_new(git_odb_backend **out);
  *	Dump all the queued in-memory writes to a packfile.
  *
  *	The contents of the packfile will be stored in the given buffer.
- *	It is the caller's responsability to ensure that the generated
+ *	It is the caller's responsibility to ensure that the generated
  *	packfile is available to the repository (e.g. by writing it
  *	to disk, or doing something crazy like distributing it across
  *	several copies of the repository over a network).
diff --git a/include/git2/sys/transport.h b/include/git2/sys/transport.h
index 1e8f4e4..b50438e 100644
--- a/include/git2/sys/transport.h
+++ b/include/git2/sys/transport.h
@@ -49,7 +49,7 @@ struct git_transport {
 
 	/* This function may be called after a successful call to
 	 * connect(). The array returned is owned by the transport and
-	 * is guranteed until the next call of a transport function. */
+	 * is guaranteed until the next call of a transport function. */
 	int (*ls)(
 		const git_remote_head ***out,
 		size_t *size,
diff --git a/src/commit_list.c b/src/commit_list.c
index 9db3f56..3054c18 100644
--- a/src/commit_list.c
+++ b/src/commit_list.c
@@ -151,7 +151,7 @@ static int commit_quick_parse(
 	while (buffer > committer_start && git__isspace(*buffer))
 		buffer--;
 
-	/* Seek for the begining of the pack of digits */
+	/* Seek for the beginning of the pack of digits */
 	while (buffer > committer_start && git__isdigit(*buffer))
 		buffer--;
 
diff --git a/src/common.h b/src/common.h
index 807e5fa..a8f60fe 100644
--- a/src/common.h
+++ b/src/common.h
@@ -68,7 +68,7 @@
 #define GITERR_CHECK_ALLOC(ptr) if (ptr == NULL) { return -1; }
 
 /**
- * Check a return value and propogate result if non-zero.
+ * Check a return value and propagate result if non-zero.
  */
 #define GITERR_CHECK_ERROR(code) \
 	do { int _err = (code); if (_err) return _err; } while (0)
diff --git a/src/config_file.c b/src/config_file.c
index d72e12c..94f292c 100644
--- a/src/config_file.c
+++ b/src/config_file.c
@@ -1532,7 +1532,7 @@ static int config_write(diskfile_backend *cfg, const char *key, const regex_t *p
 				goto rewrite_fail;
 
 			/* Sanity check: if we are here, and value is NULL, that means that somebody
-			 * touched the config file after our intial read. We should probably assert()
+			 * touched the config file after our initial read. We should probably assert()
 			 * this, but instead we'll handle it gracefully with an error. */
 			if (value == NULL) {
 				giterr_set(GITERR_CONFIG,
diff --git a/src/odb_loose.c b/src/odb_loose.c
index ef6de41..ea9bdc4 100644
--- a/src/odb_loose.c
+++ b/src/odb_loose.c
@@ -56,7 +56,7 @@ typedef struct {
 
 /***********************************************************
  *
- * MISCELANEOUS HELPER FUNCTIONS
+ * MISCELLANEOUS HELPER FUNCTIONS
  *
  ***********************************************************/
 
diff --git a/src/path.h b/src/path.h
index 11bb6d1..23d7c2d 100644
--- a/src/path.h
+++ b/src/path.h
@@ -307,7 +307,7 @@ extern int git_path_cmp(
  * reached (inclusive of a final call at the root_path).
  *
  * Returning anything other than 0 from the callback function
- * will stop the iteration and propogate the error to the caller.
+ * will stop the iteration and propagate the error to the caller.
  *
  * @param pathbuf Buffer the function reads the directory from and
  *		and updates with each successive name.
diff --git a/src/pool.c b/src/pool.c
index 180643c..a5dfa0f 100644
--- a/src/pool.c
+++ b/src/pool.c
@@ -159,7 +159,7 @@ void *git_pool_malloc(git_pool *pool, uint32_t items)
 		return ptr;
 	}
 
-	/* just add a block if there is no open one to accomodate this */
+	/* just add a block if there is no open one to accommodate this */
 	if (size >= pool->page_size || !scan || scan->avail < size)
 		return pool_alloc_page(pool, size);
 
diff --git a/src/repository.h b/src/repository.h
index 45b95a0..40e54c1 100644
--- a/src/repository.h
+++ b/src/repository.h
@@ -150,7 +150,7 @@ int git_repository_index__weakptr(git_index **out, git_repository *repo);
  * CVAR cache
  *
  * Efficient access to the most used config variables of a repository.
- * The cache is cleared everytime the config backend is replaced.
+ * The cache is cleared every time the config backend is replaced.
  */
 int git_repository__cvar(int *out, git_repository *repo, git_cvar_cached cvar);
 void git_repository__cvar_cache_clear(git_repository *repo);
diff --git a/src/tag.c b/src/tag.c
index ca2ed53..dc0827b 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -258,7 +258,7 @@ static int git_tag_create__internal(
 		goto cleanup;
 
 	/** Ensure the tag name doesn't conflict with an already existing
-	 *	reference unless overwriting has explictly been requested **/
+	 *	reference unless overwriting has explicitly been requested **/
 	if (error == 0 && !allow_ref_overwrite) {
 		git_buf_free(&ref_name);
 		giterr_set(GITERR_TAG, "Tag already exists");
diff --git a/src/xdiff/xdiffi.c b/src/xdiff/xdiffi.c
index 75a3922..84aa0fc 100644
--- a/src/xdiff/xdiffi.c
+++ b/src/xdiff/xdiffi.c
@@ -490,7 +490,7 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
 
 		/*
 		 * Try to move back the possibly merged group of changes, to match
-		 * the recorded postion in the other file.
+		 * the recorded position in the other file.
 		 */
 		while (ixref < ix) {
 			rchg[--ixs] = 1;
diff --git a/src/xdiff/xhistogram.c b/src/xdiff/xhistogram.c
index 5d10175..c848128 100644
--- a/src/xdiff/xhistogram.c
+++ b/src/xdiff/xhistogram.c
@@ -55,7 +55,7 @@ struct histindex {
 	struct record {
 		unsigned int ptr, cnt;
 		struct record *next;
-	} **records, /* an ocurrence */
+	} **records, /* an occurrence */
 	  **line_map; /* map of line to record chain */
 	chastore_t rcha;
 	unsigned int *next_ptrs;
diff --git a/tests/index/tests.c b/tests/index/tests.c
index 3738899..7d544e8 100644
--- a/tests/index/tests.c
+++ b/tests/index/tests.c
@@ -506,7 +506,7 @@ void test_index_tests__reload_from_disk(void)
 	cl_git_pass(git_index_open(&read_index, write_index->index_file_path));
 	cl_assert_equal_i(false, read_index->on_disk);
 
-	/* Stage two new files agaisnt the write_index */
+	/* Stage two new files against the write_index */
 	cl_git_pass(git_index_add_bypath(write_index, "a.txt"));
 	cl_git_pass(git_index_add_bypath(write_index, "b.txt"));