diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-03-26 16:40:20 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-03-26 16:42:29 +0000 |
| commit | 3801ce85566e408934023333761a14fe2fc73a18 (patch) | |
| tree | 0b39720ba6daabbbf9b4a7bf1b43503729c09263 | |
| parent | 3b8767aea464fc82b21e321aa883783eff2419b5 (diff) | |
| download | infrastructure-3801ce85566e408934023333761a14fe2fc73a18.tar.gz | |
baserock_gerrit: Rebase patches before merging them
This avoids potentially having lots of merge commits. Previously, for
each change that was not against the latest commit in 'master', there
would be a merge commit created.
Change-Id: I858ffafd05731c50362596852927fd075330b97f
| -rw-r--r-- | baserock_gerrit/All-Projects/project.config | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/baserock_gerrit/All-Projects/project.config b/baserock_gerrit/All-Projects/project.config index acf859d2..678fe0ee 100644 --- a/baserock_gerrit/All-Projects/project.config +++ b/baserock_gerrit/All-Projects/project.config @@ -22,6 +22,7 @@ [submit] mergeContent = true + action = rebase if necessary [capability] administrateServer = group Administrators |