[libgit2-glib] Bind GgitRebaseOperationType
- From: Ignacio Casal Quinteiro <icq src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgit2-glib] Bind GgitRebaseOperationType
- Date: Thu, 13 Aug 2015 06:36:39 +0000 (UTC)
commit 232fd2dce63e978b6288e775db7bd3afebb7d6a4
Author: Ignacio Casal Quinteiro <icq gnome org>
Date: Thu Aug 13 08:36:08 2015 +0200
Bind GgitRebaseOperationType
libgit2-glib/ggit-types.c | 7 +++++++
libgit2-glib/ggit-types.h | 27 +++++++++++++++++++++++++++
2 files changed, 34 insertions(+), 0 deletions(-)
---
diff --git a/libgit2-glib/ggit-types.c b/libgit2-glib/ggit-types.c
index 11c504a..2a97720 100644
--- a/libgit2-glib/ggit-types.c
+++ b/libgit2-glib/ggit-types.c
@@ -123,6 +123,13 @@ ASSERT_ENUM (GGIT_MERGE_FILE_FAVOR_UNION, GIT_MERGE_FILE_FAVOR_UNION);
ASSERT_ENUM (GGIT_MERGE_TREE_FIND_RENAMES, GIT_MERGE_TREE_FIND_RENAMES);
+ASSERT_ENUM (GGIT_REBASE_OPERATION_PICK, GIT_REBASE_OPERATION_PICK);
+ASSERT_ENUM (GGIT_REBASE_OPERATION_REWORD, GIT_REBASE_OPERATION_REWORD);
+ASSERT_ENUM (GGIT_REBASE_OPERATION_EDIT, GIT_REBASE_OPERATION_EDIT);
+ASSERT_ENUM (GGIT_REBASE_OPERATION_SQUASH, GIT_REBASE_OPERATION_SQUASH);
+ASSERT_ENUM (GGIT_REBASE_OPERATION_FIXUP, GIT_REBASE_OPERATION_FIXUP);
+ASSERT_ENUM (GGIT_REBASE_OPERATION_EXEC, GIT_REBASE_OPERATION_EXEC);
+
ASSERT_ENUM (GGIT_REMOTE_DOWNLOAD_TAGS_UNSPECIFIED, GIT_REMOTE_DOWNLOAD_TAGS_UNSPECIFIED);
ASSERT_ENUM (GGIT_REMOTE_DOWNLOAD_TAGS_AUTO, GIT_REMOTE_DOWNLOAD_TAGS_AUTO);
ASSERT_ENUM (GGIT_REMOTE_DOWNLOAD_TAGS_NONE, GIT_REMOTE_DOWNLOAD_TAGS_NONE);
diff --git a/libgit2-glib/ggit-types.h b/libgit2-glib/ggit-types.h
index b01a988..e0b176e 100644
--- a/libgit2-glib/ggit-types.h
+++ b/libgit2-glib/ggit-types.h
@@ -586,6 +586,33 @@ typedef enum {
GGIT_MERGE_TREE_FIND_RENAMES = (1 << 0)
} GgitMergeTreeFlags;
+/**
+ * GgitRebaseOperationType:
+ * @GGIT_REBASE_OPERATION_PICK: The given commit is to be cherry-picked.
+ * The client should commit the changes and continue if there are no conflicts.
+ * @GGIT_REBASE_OPERATION_REWORD: The given commit is to be cherry-picked,
+ * but the client should prompt the user to provide an updated commit message.
+ * @GGIT_REBASE_OPERATION_EDIT: The given commit is to be cherry-picked,
+ * but the client should stop to allow the user to edit the changes before
+ * committing them.
+ * @GGIT_REBASE_OPERATION_SQUASH: The given commit is to be squashed into
+ * the previous commit. The commit message will be merged with the previous message.
+ * @GGIT_REBASE_OPERATION_FIXUP: The given commit is to be squashed into the
+ * previous commit. The commit message from this commit will be discarded.
+ * @GGIT_REBASE_OPERATION_EXEC: No commit will be cherry-picked.
+ * The client should run the given command and (if successful) continue.
+ *
+ * Type of rebase operation in-progress.
+ */
+typedef enum {
+ GGIT_REBASE_OPERATION_PICK = 0,
+ GGIT_REBASE_OPERATION_REWORD,
+ GGIT_REBASE_OPERATION_EDIT,
+ GGIT_REBASE_OPERATION_SQUASH,
+ GGIT_REBASE_OPERATION_FIXUP,
+ GGIT_REBASE_OPERATION_EXEC
+} GgitRebaseOperationType;
+
/* NOTE: keep in sync with git2/refs.h */
/**
* GgitRemoteDownloadTagsType:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]