diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2014-07-21 20:25:03 +0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2014-10-27 05:59:32 +0300 |
| commit | 5ae9d296e3313be59a969cb8eab250c7c8f7307d (patch) | |
| tree | 53f130e2f3bd49150458e4f32dfcc7135c9a27a0 /include | |
| parent | bad4937ea50a8874598171c7ccb3d3443f1daf7b (diff) | |
git_rebase_finish: rewrite notes when finishing rebase
Diffstat (limited to 'include')
| -rw-r--r-- | include/git2/rebase.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/include/git2/rebase.h b/include/git2/rebase.h index e123ae506..d9cf2318e 100644 --- a/include/git2/rebase.h +++ b/include/git2/rebase.h @@ -28,6 +28,15 @@ typedef struct { * interoperability with other clients. */ int quiet; + + /** + * Canonical name of the notes reference used to rewrite notes for + * rebased commits when finishing the rebase; if NULL, the contents of + * the coniguration option `notes.rewriteRef` is examined, unless the + * configuration option `notes.rewrite.rebase` is set to false. If + * `notes.rewriteRef` is NULL, notes will not be rewritten. + */ + const char *rewrite_notes_ref; } git_rebase_options; #define GIT_REBASE_OPTIONS_VERSION 1 @@ -130,11 +139,13 @@ GIT_EXTERN(int) git_rebase_abort( * * @param repo The repository with the in-progress rebase * @param signature The identity that is finishing the rebase + * @param opts Options to specify how rebase is finished * @param Zero on success; -1 on error */ GIT_EXTERN(int) git_rebase_finish( git_repository *repo, - const git_signature *signature); + const git_signature *signature, + const git_rebase_options *opts); /** @} */ GIT_END_DECL |