Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
git2
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lvzhengyang
git2
Commits
7eb222fc
Commit
7eb222fc
authored
Jan 06, 2013
by
Kevin Sawicki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Correct typos in documentation
parent
e5562e18
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
12 additions
and
12 deletions
+12
-12
include/git2/checkout.h
+3
-3
include/git2/config.h
+3
-3
include/git2/diff.h
+2
-2
include/git2/ignore.h
+1
-1
include/git2/refspec.h
+1
-1
include/git2/repository.h
+1
-1
include/git2/status.h
+1
-1
No files found.
include/git2/checkout.h
View file @
7eb222fc
...
@@ -83,7 +83,7 @@ GIT_BEGIN_DECL
...
@@ -83,7 +83,7 @@ GIT_BEGIN_DECL
* in target, baseline, or index, and not ignored) from the working dir.
* in target, baseline, or index, and not ignored) from the working dir.
*
*
* - GIT_CHECKOUT_REMOVE_IGNORED means remove ignored files (that are also
* - GIT_CHECKOUT_REMOVE_IGNORED means remove ignored files (that are also
* un
rt
acked) from the working directory as well.
* un
tr
acked) from the working directory as well.
*
*
* - GIT_CHECKOUT_UPDATE_ONLY means to only update the content of files that
* - 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
* already exist. Files will not be created nor deleted. This just skips
...
@@ -97,13 +97,13 @@ GIT_BEGIN_DECL
...
@@ -97,13 +97,13 @@ GIT_BEGIN_DECL
*
*
* - Unmerged index entries are conflicts. GIT_CHECKOUT_SKIP_UNMERGED skips
* - Unmerged index entries are conflicts. GIT_CHECKOUT_SKIP_UNMERGED skips
* files with unmerged index entries instead. GIT_CHECKOUT_USE_OURS and
* files with unmerged index entries instead. GIT_CHECKOUT_USE_OURS and
* GIT_CHECKOUT_USE_THEIRS to procee
e
d 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.
* stage 2 ("ours") or stage 3 ("theirs") version of files in the index.
*/
*/
typedef
enum
{
typedef
enum
{
GIT_CHECKOUT_NONE
=
0
,
/** default is a dry run, no actual updates */
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 uncommit
t
ed data */
GIT_CHECKOUT_SAFE
=
(
1u
<<
0
),
GIT_CHECKOUT_SAFE
=
(
1u
<<
0
),
/** Allow safe updates plus creation of missing files */
/** Allow safe updates plus creation of missing files */
...
...
include/git2/config.h
View file @
7eb222fc
...
@@ -297,7 +297,7 @@ GIT_EXTERN(int) git_config_get_int32(int32_t *out, const git_config *cfg, const
...
@@ -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
* All config files will be looked into, in the order of their
* defined level. A higher level means a higher priority. The
* defined level. A higher level means a higher priority. The
* first occurence of the variable will be returned here.
* first occur
r
ence of the variable will be returned here.
*
*
* @param out pointer to the variable where the value should be stored
* @param out pointer to the variable where the value should be stored
* @param cfg where to look for the variable
* @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
...
@@ -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
* All config files will be looked into, in the order of their
* defined level. A higher level means a higher priority. The
* defined level. A higher level means a higher priority. The
* first occurence of the variable will be returned here.
* first occur
r
ence of the variable will be returned here.
*
*
* @param out pointer to the variable where the value should be stored
* @param out pointer to the variable where the value should be stored
* @param cfg where to look for the variable
* @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
...
@@ -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
* All config files will be looked into, in the order of their
* defined level. A higher level means a higher priority. The
* defined level. A higher level means a higher priority. The
* first occurence of the variable will be returned here.
* first occur
r
ence of the variable will be returned here.
*
*
* @param out pointer to the variable's value
* @param out pointer to the variable's value
* @param cfg where to look for the variable
* @param cfg where to look for the variable
...
...
include/git2/diff.h
View file @
7eb222fc
...
@@ -241,8 +241,8 @@ typedef struct {
...
@@ -241,8 +241,8 @@ typedef struct {
* callback functions and you can use the contents to understand exactly
* callback functions and you can use the contents to understand exactly
* what has changed.
* what has changed.
*
*
* The `old_file` repesents the "from" side of the diff and the `new_file`
* The `old_file` rep
r
esents the "from" side of the diff and the `new_file`
* repesents to "to" side of the diff. What those means depend on the
* rep
r
esents 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.
* 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.
* You can also use the `GIT_DIFF_REVERSE` flag to flip it around.
*
*
...
...
include/git2/ignore.h
View file @
7eb222fc
...
@@ -57,7 +57,7 @@ GIT_EXTERN(int) git_ignore_clear_internal_rules(
...
@@ -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
* 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
* 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 commit
t
ed to the repository.
*
*
* One way to think of this is if you were to do "git add ." on the
* 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?
* directory containing the file, would it be added or not?
...
...
include/git2/refspec.h
View file @
7eb222fc
...
@@ -56,7 +56,7 @@ GIT_EXTERN(int) git_refspec_src_matches(const git_refspec *refspec, const char *
...
@@ -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
* Transform a reference to its target following the refspec's rules
*
*
* @param out where to store the target name
* @param out where to store the target name
* @param outlen the size o
u
f the `out` buffer
* @param outlen the size of the `out` buffer
* @param spec the refspec
* @param spec the refspec
* @param name the name of the reference to transform
* @param name the name of the reference to transform
* @return 0, GIT_EBUFS or another error
* @return 0, GIT_EBUFS or another error
...
...
include/git2/repository.h
View file @
7eb222fc
...
@@ -609,7 +609,7 @@ GIT_EXTERN(int) git_repository_set_head_detached(
...
@@ -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.
* 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
* If the HEAD is already detached and points to a non commitish, the HEAD is
* unal
e
tered, and -1 is returned.
* unaltered, and -1 is returned.
*
*
* Otherwise, the HEAD will be detached and point to the peeled Commit.
* Otherwise, the HEAD will be detached and point to the peeled Commit.
*
*
...
...
include/git2/status.h
View file @
7eb222fc
...
@@ -210,7 +210,7 @@ GIT_EXTERN(int) git_status_file(
...
@@ -210,7 +210,7 @@ GIT_EXTERN(int) git_status_file(
*
*
* This function checks the ignore rules to see if they would apply to the
* 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
* 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 commit
t
ed to the repository.
*
*
* One way to think of this is if you were to do "git add ." on the
* 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?
* directory containing the file, would it be added or not?
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment