diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2015-04-20 17:19:08 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2015-04-20 17:19:08 -0400 |
| commit | 94c988f6d6f4930ee4c120f6ce7932b5e49637be (patch) | |
| tree | f52538e92e43ff0a1fd320171113ab505368a1cf /include | |
| parent | 7838235890b10e1e3c6ceb2c696c4721ad438246 (diff) | |
| download | libgit2-94c988f6d6f4930ee4c120f6ce7932b5e49637be.tar.gz | |
rebase: include checkout opts within rebase opts
Diffstat (limited to 'include')
| -rw-r--r-- | include/git2/rebase.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/git2/rebase.h b/include/git2/rebase.h index 370792f58..b85f7e2aa 100644 --- a/include/git2/rebase.h +++ b/include/git2/rebase.h @@ -55,7 +55,7 @@ typedef struct { * and a minimum strategy of `GIT_CHECKOUT_FORCE` is defaulted in * `abort` to match git semantics. */ - git_checkout_options *checkout_options; + git_checkout_options checkout_options; } git_rebase_options; /** @@ -100,7 +100,8 @@ typedef enum { } git_rebase_operation_t; #define GIT_REBASE_OPTIONS_VERSION 1 -#define GIT_REBASE_OPTIONS_INIT {GIT_REBASE_OPTIONS_VERSION} +#define GIT_REBASE_OPTIONS_INIT \ + {GIT_REBASE_OPTIONS_VERSION, 0, NULL, GIT_CHECKOUT_OPTIONS_INIT} /** Indicates that a rebase operation is not (yet) in progress. */ #define GIT_REBASE_NO_OPERATION SIZE_MAX |