summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--project.config2
1 files changed, 1 insertions, 1 deletions
diff --git a/project.config b/project.config
index da4671d6af9b..25b94888eeb6 100644
--- a/project.config
+++ b/project.config
@@ -4,7 +4,7 @@
 	mergeContent = true
 	matchAuthorToCommitterDate = false
 	rejectEmptyCommit = true
-	action = rebase always
+	action = rebase if necessary
 [project]
 	description = This is the repository.
 [receive]