diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2014-12-06 12:26:04 -0500 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2014-12-06 12:26:04 -0500 |
| commit | f2e09b8aac1e107a3a02f2831b46d5b4367cd5ca (patch) | |
| tree | 231e6871e87fa93c1c868ccb50d72312c9263b07 /include/git2/cherrypick.h | |
| parent | 013924c17c03c42bce363ea1ddc949444164c2bc (diff) | |
| parent | a295bd2dc4a1ac2b15b9c39089d148499e6e9e00 (diff) | |
| download | libgit2-f2e09b8aac1e107a3a02f2831b46d5b4367cd5ca.tar.gz | |
Merge pull request #2748 from libgit2/cmn/doc-all
doc: add documentation to all the public structs and enums
Diffstat (limited to 'include/git2/cherrypick.h')
| -rw-r--r-- | include/git2/cherrypick.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/git2/cherrypick.h b/include/git2/cherrypick.h index dea67c1ff..208166c19 100644 --- a/include/git2/cherrypick.h +++ b/include/git2/cherrypick.h @@ -20,14 +20,17 @@ */ GIT_BEGIN_DECL +/** + * Cherry-pick options + */ typedef struct { unsigned int version; /** For merge commits, the "mainline" is treated as the parent. */ unsigned int mainline; - git_merge_options merge_opts; - git_checkout_options checkout_opts; + git_merge_options merge_opts; /*< Options for the merging */ + git_checkout_options checkout_opts; /*< Options for the checkout */ } git_cherrypick_options; #define GIT_CHERRYPICK_OPTIONS_VERSION 1 |