diff --git a/project.config b/project.config
index f266c30..72b31f1 100644
--- a/project.config
+++ b/project.config
@@ -9,6 +9,7 @@
 [submit]
 	mergeContent = true
 	matchAuthorToCommitterDate = false
+	action = rebase if necessary
 [capability]
 	administrateServer = group Administrators
 	administrateServer = group ldap/OSM_Admin