Merge "Add new submit strategy "Rebase Always"."

2016-10-21 13:34:44 +00:00
parent 87f4b1d61a a11e63df5c
commit 42b7c5155b
22 changed files with 806 additions and 533 deletions
--- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/SubmitType.java
+++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/SubmitType.java
@@ -18,6 +18,7 @@ public enum SubmitType {
  FAST_FORWARD_ONLY,
  MERGE_IF_NECESSARY,
  REBASE_IF_NECESSARY,
+  REBASE_ALWAYS,
  MERGE_ALWAYS,
  CHERRY_PICK
 }