Unverified Commit 9ecbff12 by Edward Thomson Committed by GitHub

Merge pull request #5903 from punkymaniac/patch-documentation

Patch documentation
parents 868f4bcb a2fa9a57
...@@ -100,6 +100,7 @@ GIT_EXTERN(int) git_apply_options_init(git_apply_options *opts, unsigned int ver ...@@ -100,6 +100,7 @@ GIT_EXTERN(int) git_apply_options_init(git_apply_options *opts, unsigned int ver
* @param preimage the tree to apply the diff to * @param preimage the tree to apply the diff to
* @param diff the diff to apply * @param diff the diff to apply
* @param options the options for the apply (or null for defaults) * @param options the options for the apply (or null for defaults)
* @return 0 or an error code
*/ */
GIT_EXTERN(int) git_apply_to_tree( GIT_EXTERN(int) git_apply_to_tree(
git_index **out, git_index **out,
...@@ -137,6 +138,7 @@ typedef enum { ...@@ -137,6 +138,7 @@ typedef enum {
* @param diff the diff to apply * @param diff the diff to apply
* @param location the location to apply (workdir, index or both) * @param location the location to apply (workdir, index or both)
* @param options the options for the apply (or null for defaults) * @param options the options for the apply (or null for defaults)
* @return 0 or an error code
*/ */
GIT_EXTERN(int) git_apply( GIT_EXTERN(int) git_apply(
git_repository *repo, git_repository *repo,
......
...@@ -356,6 +356,11 @@ typedef enum { ...@@ -356,6 +356,11 @@ typedef enum {
* > * >
* > - `ciphers` is the list of ciphers that are eanbled. * > - `ciphers` is the list of ciphers that are eanbled.
* *
* * opts(GIT_OPT_GET_USER_AGENT, git_buf *out)
*
* > Get the value of the User-Agent header.
* > The User-Agent is written to the `out` buffer.
*
* * opts(GIT_OPT_ENABLE_OFS_DELTA, int enabled) * * opts(GIT_OPT_ENABLE_OFS_DELTA, int enabled)
* *
* > Enable or disable the use of "offset deltas" when creating packfiles, * > Enable or disable the use of "offset deltas" when creating packfiles,
......
...@@ -51,7 +51,7 @@ typedef struct git_indexer_progress { ...@@ -51,7 +51,7 @@ typedef struct git_indexer_progress {
* Type for progress callbacks during indexing. Return a value less * Type for progress callbacks during indexing. Return a value less
* than zero to cancel the indexing or download. * than zero to cancel the indexing or download.
* *
* @param stats Structure containing information about the state of the tran sfer * @param stats Structure containing information about the state of the transfer
* @param payload Payload provided by caller * @param payload Payload provided by caller
*/ */
typedef int GIT_CALLBACK(git_indexer_progress_cb)(const git_indexer_progress *stats, void *payload); typedef int GIT_CALLBACK(git_indexer_progress_cb)(const git_indexer_progress *stats, void *payload);
...@@ -64,6 +64,7 @@ typedef struct git_indexer_options { ...@@ -64,6 +64,7 @@ typedef struct git_indexer_options {
/** progress_cb function to call with progress information */ /** progress_cb function to call with progress information */
git_indexer_progress_cb progress_cb; git_indexer_progress_cb progress_cb;
/** progress_cb_payload payload for the progress callback */ /** progress_cb_payload payload for the progress callback */
void *progress_cb_payload; void *progress_cb_payload;
......
...@@ -334,6 +334,7 @@ GIT_EXTERN(int) git_treebuilder_insert( ...@@ -334,6 +334,7 @@ GIT_EXTERN(int) git_treebuilder_insert(
* *
* @param bld Tree builder * @param bld Tree builder
* @param filename Filename of the entry to remove * @param filename Filename of the entry to remove
* @return 0 or an error code
*/ */
GIT_EXTERN(int) git_treebuilder_remove( GIT_EXTERN(int) git_treebuilder_remove(
git_treebuilder *bld, const char *filename); git_treebuilder *bld, const char *filename);
...@@ -463,6 +464,7 @@ typedef struct { ...@@ -463,6 +464,7 @@ typedef struct {
* @param baseline the tree to base these changes on * @param baseline the tree to base these changes on
* @param nupdates the number of elements in the update list * @param nupdates the number of elements in the update list
* @param updates the list of updates to perform * @param updates the list of updates to perform
* @return 0 or an error code
*/ */
GIT_EXTERN(int) git_tree_create_updated(git_oid *out, git_repository *repo, git_tree *baseline, size_t nupdates, const git_tree_update *updates); GIT_EXTERN(int) git_tree_create_updated(git_oid *out, git_repository *repo, git_tree *baseline, size_t nupdates, const git_tree_update *updates);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment