summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2015-07-25 00:58:07 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-07-25 00:58:07 +0000
commitcb7634a2fac3a8251390130d58ad3917df5671dc (patch)
tree081132b533b48679433052efaa78cd998fd2c747
parentfa7b332775c7781a1a699ebc789cd4adb2a468f2 (diff)
downloadtrusty-cb7634a2fac3a8251390130d58ad3917df5671dc.tar.gz
Modified project settings
-rw-r--r--project.config4
1 files changed, 2 insertions, 2 deletions
diff --git a/project.config b/project.config
index 9a6046b..cff1c26 100644
--- a/project.config
+++ b/project.config
@@ -3,8 +3,8 @@
[receive]
requireContributorAgreement = true
[submit]
- action = merge always
- mergeContent = true
+ action = fast forward only
+ mergeContent = false
[access "refs/heads/*"]
exclusiveGroupPermissions = push label-Code-Review
create = group trusty-admins