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
eb5f0346
Commit
eb5f0346
authored
Jul 11, 2014
by
Carlos Martín Nieto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
checkout: fix docs formatting for the options
parent
18eb6ec8
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
12 deletions
+12
-12
include/git2/checkout.h
+12
-12
No files found.
include/git2/checkout.h
View file @
eb5f0346
...
...
@@ -233,18 +233,18 @@ typedef void (*git_checkout_progress_cb)(
typedef
struct
git_checkout_options
{
unsigned
int
version
;
unsigned
int
checkout_strategy
;
/** default will be a dry run */
unsigned
int
checkout_strategy
;
/**
<
default will be a dry run */
int
disable_filters
;
/** don't apply filters like CRLF conversion */
unsigned
int
dir_mode
;
/** default is 0755 */
unsigned
int
file_mode
;
/** default is 0644 or 0755 as dictated by blob */
int
file_open_flags
;
/** default is O_CREAT | O_TRUNC | O_WRONLY */
int
disable_filters
;
/**
<
don't apply filters like CRLF conversion */
unsigned
int
dir_mode
;
/**
<
default is 0755 */
unsigned
int
file_mode
;
/**
<
default is 0644 or 0755 as dictated by blob */
int
file_open_flags
;
/**
<
default is O_CREAT | O_TRUNC | O_WRONLY */
unsigned
int
notify_flags
;
/** see `git_checkout_notify_t` above */
unsigned
int
notify_flags
;
/**
<
see `git_checkout_notify_t` above */
git_checkout_notify_cb
notify_cb
;
void
*
notify_payload
;
/* Optional callback to notify the consumer of checkout progress. */
/*
*
Optional callback to notify the consumer of checkout progress. */
git_checkout_progress_cb
progress_cb
;
void
*
progress_payload
;
...
...
@@ -254,13 +254,13 @@ typedef struct git_checkout_options {
*/
git_strarray
paths
;
git_tree
*
baseline
;
/** expected content of workdir, defaults to HEAD */
git_tree
*
baseline
;
/**
<
expected content of workdir, defaults to HEAD */
const
char
*
target_directory
;
/** alternative checkout path to workdir */
const
char
*
target_directory
;
/**
<
alternative checkout path to workdir */
const
char
*
ancestor_label
;
/** the name of the common ancestor side of conflicts */
const
char
*
our_label
;
/** the name of the "our" side of conflicts */
const
char
*
their_label
;
/** the name of the "their" side of conflicts */
const
char
*
ancestor_label
;
/**
<
the name of the common ancestor side of conflicts */
const
char
*
our_label
;
/**
<
the name of the "our" side of conflicts */
const
char
*
their_label
;
/**
<
the name of the "their" side of conflicts */
}
git_checkout_options
;
#define GIT_CHECKOUT_OPTIONS_VERSION 1
...
...
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