summary refs log tree commit diff
path: root/project.config
diff options
context:
space:
mode:
authortazjin <mail@tazj.in>2021-11-23T10·36+0000
committerGerrit Code Review <git@whitby.tvl.fyi>2021-11-23T10·36+0000
commitdb8009fbbf26299f549fe9f6e36edc261355b573 (patch)
tree8bcb0e5e6215608b7c36e56a19ac669a771d4ff8 /project.config
parent08207de76a0e86bd580ea94dcdd922686f3cd243 (diff)
Modified project settings
Diffstat (limited to 'project.config')
-rw-r--r--project.config2
1 files changed, 1 insertions, 1 deletions
diff --git a/project.config b/project.config
index da4671d6af..25b94888ee 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]