summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorKevin Sawicki <kevin@github.com>2013-01-06 10:39:35 -0800
committerKevin Sawicki <kevin@github.com>2013-01-06 10:39:35 -0800
commit7eb222fc7d392e8570e93373d7ffc7f67ea792cc (patch)
treebccfb6acf06f51f9566b505bf7bf6233b6678e2e /include
parente5562e181cd76d3b0447011bc892c86b03ed2952 (diff)
downloadlibgit2-7eb222fc7d392e8570e93373d7ffc7f67ea792cc.tar.gz
Correct typos in documentation
Diffstat (limited to 'include')
-rw-r--r--include/git2/checkout.h6
-rw-r--r--include/git2/config.h6
-rw-r--r--include/git2/diff.h4
-rw-r--r--include/git2/ignore.h2
-rw-r--r--include/git2/refspec.h2
-rw-r--r--include/git2/repository.h2
-rw-r--r--include/git2/status.h2
7 files changed, 12 insertions, 12 deletions
diff --git a/include/git2/checkout.h b/include/git2/checkout.h
index 12fffebad..b25298f33 100644
--- a/include/git2/checkout.h
+++ b/include/git2/checkout.h
@@ -83,7 +83,7 @@ GIT_BEGIN_DECL
* in target, baseline, or index, and not ignored) from the working dir.
*
* - GIT_CHECKOUT_REMOVE_IGNORED means remove ignored files (that are also
- * unrtacked) from the working directory as well.
+ * untracked) from the working directory as well.
*
* - GIT_CHECKOUT_UPDATE_ONLY means to only update the content of files that
* already exist. Files will not be created nor deleted. This just skips
@@ -97,13 +97,13 @@ GIT_BEGIN_DECL
*
* - Unmerged index entries are conflicts. GIT_CHECKOUT_SKIP_UNMERGED skips
* files with unmerged index entries instead. GIT_CHECKOUT_USE_OURS and
- * GIT_CHECKOUT_USE_THEIRS to proceeed with the checkout using either the
+ * GIT_CHECKOUT_USE_THEIRS to proceed with the checkout using either the
* stage 2 ("ours") or stage 3 ("theirs") version of files in the index.
*/
typedef enum {
GIT_CHECKOUT_NONE = 0, /** default is a dry run, no actual updates */
- /** Allow safe updates that cannot overwrite uncommited data */
+ /** Allow safe updates that cannot overwrite uncommitted data */
GIT_CHECKOUT_SAFE = (1u << 0),
/** Allow safe updates plus creation of missing files */
diff --git a/include/git2/config.h b/include/git2/config.h
index b186e70da..77fd84797 100644
--- a/include/git2/config.h
+++ b/include/git2/config.h
@@ -297,7 +297,7 @@ GIT_EXTERN(int) git_config_get_int32(int32_t *out, const git_config *cfg, const
*
* 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
@@ -314,7 +314,7 @@ GIT_EXTERN(int) git_config_get_int64(int64_t *out, const git_config *cfg, const
*
* 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
@@ -331,7 +331,7 @@ GIT_EXTERN(int) git_config_get_bool(int *out, const git_config *cfg, const char
*
* 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's value
* @param cfg where to look for the variable
diff --git a/include/git2/diff.h b/include/git2/diff.h
index b26dd4214..760de6fd1 100644
--- a/include/git2/diff.h
+++ b/include/git2/diff.h
@@ -241,8 +241,8 @@ typedef struct {
* callback functions and you can use the contents to understand exactly
* what has changed.
*
- * The `old_file` repesents the "from" side of the diff and the `new_file`
- * repesents to "to" side of the diff. What those means depend on the
+ * The `old_file` represents the "from" side of the diff and the `new_file`
+ * represents to "to" side of the diff. What those means depend on the
* function that was used to generate the diff and will be documented below.
* You can also use the `GIT_DIFF_REVERSE` flag to flip it around.
*
diff --git a/include/git2/ignore.h b/include/git2/ignore.h
index 592c96e65..48993da3e 100644
--- a/include/git2/ignore.h
+++ b/include/git2/ignore.h
@@ -57,7 +57,7 @@ GIT_EXTERN(int) git_ignore_clear_internal_rules(
*
* This function checks the ignore rules to see if they would apply to the
* given file. This indicates if the file would be ignored regardless of
- * whether the file is already in the index or commited to the repository.
+ * whether the file is already in the index or committed to the repository.
*
* One way to think of this is if you were to do "git add ." on the
* directory containing the file, would it be added or not?
diff --git a/include/git2/refspec.h b/include/git2/refspec.h
index 1100e9022..21fea20a6 100644
--- a/include/git2/refspec.h
+++ b/include/git2/refspec.h
@@ -56,7 +56,7 @@ GIT_EXTERN(int) git_refspec_src_matches(const git_refspec *refspec, const char *
* Transform a reference to its target following the refspec's rules
*
* @param out where to store the target name
- * @param outlen the size ouf the `out` buffer
+ * @param outlen the size of the `out` buffer
* @param spec the refspec
* @param name the name of the reference to transform
* @return 0, GIT_EBUFS or another error
diff --git a/include/git2/repository.h b/include/git2/repository.h
index 1371d5409..abd7de8fd 100644
--- a/include/git2/repository.h
+++ b/include/git2/repository.h
@@ -609,7 +609,7 @@ GIT_EXTERN(int) git_repository_set_head_detached(
* updated into making it point to the peeled Commit, and 0 is returned.
*
* If the HEAD is already detached and points to a non commitish, the HEAD is
- * unaletered, and -1 is returned.
+ * unaltered, and -1 is returned.
*
* Otherwise, the HEAD will be detached and point to the peeled Commit.
*
diff --git a/include/git2/status.h b/include/git2/status.h
index a898d1f34..349d7aa0d 100644
--- a/include/git2/status.h
+++ b/include/git2/status.h
@@ -210,7 +210,7 @@ GIT_EXTERN(int) git_status_file(
*
* This function checks the ignore rules to see if they would apply to the
* given file. This indicates if the file would be ignored regardless of
- * whether the file is already in the index or commited to the repository.
+ * whether the file is already in the index or committed to the repository.
*
* One way to think of this is if you were to do "git add ." on the
* directory containing the file, would it be added or not?