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
3b8a06c0
Unverified
Commit
3b8a06c0
authored
Jun 11, 2022
by
Edward Thomson
Committed by
GitHub
Jun 11, 2022
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #6287 from SkinnyMind/docs-typos
docs: fix couple of typos
parents
565a3317
9af5db9a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
7 deletions
+7
-7
include/git2/branch.h
+2
-2
include/git2/config.h
+4
-4
include/git2/merge.h
+1
-1
No files found.
include/git2/branch.h
View file @
3b8a06c0
...
...
@@ -129,8 +129,8 @@ GIT_EXTERN(void) git_branch_iterator_free(git_branch_iterator *iter);
* See `git_tag_create()` for rules about valid names.
*
* Note that if the move succeeds, the old reference object will not
+
be valid anymore, and should be freed immediately by the user using
+
`git_reference_free()`.
*
be valid anymore, and should be freed immediately by the user using
*
`git_reference_free()`.
*
* @param out New reference object for the updated name.
*
...
...
include/git2/config.h
View file @
3b8a06c0
...
...
@@ -122,7 +122,7 @@ typedef struct {
* global configuration file.
*
* This method will not guess the path to the xdg compatible
* config file (
.config/git/config
).
* config file (
`.config/git/config`
).
*
* @param out Pointer to a user-allocated git_buf in which to store the path
* @return 0 if a global configuration file has been found. Its path will be stored in `out`.
...
...
@@ -149,8 +149,8 @@ GIT_EXTERN(int) git_config_find_xdg(git_buf *out);
/**
* Locate the path to the system configuration file
*
* If
/etc/gitconfig
doesn't exist, it will look for
*
%PROGRAMFILES%\Git\etc\gitconfig
.
* If
`/etc/gitconfig`
doesn't exist, it will look for
*
`%PROGRAMFILES%\Git\etc\gitconfig`
.
*
* @param out Pointer to a user-allocated git_buf in which to store the path
* @return 0 if a system configuration file has been
...
...
@@ -161,7 +161,7 @@ GIT_EXTERN(int) git_config_find_system(git_buf *out);
/**
* Locate the path to the configuration file in ProgramData
*
* Look for the file in
%PROGRAMDATA%\Git\config
used by portable git.
* Look for the file in
`%PROGRAMDATA%\Git\config`
used by portable git.
*
* @param out Pointer to a user-allocated git_buf in which to store the path
* @return 0 if a ProgramData configuration file has been
...
...
include/git2/merge.h
View file @
3b8a06c0
...
...
@@ -603,7 +603,7 @@ GIT_EXTERN(int) git_merge_commits(
* completes, resolve any conflicts and prepare a commit.
*
* For compatibility with git, the repository is put into a merging
* state. Once the commit is done (or if the use
s
wishes to abort),
* state. Once the commit is done (or if the use
r
wishes to abort),
* you should clear this state by calling
* `git_repository_state_cleanup()`.
*
...
...
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