commit | a49e0bc92669a05c9237b4515ac7a87874896c22 | [log] [tgz] |
---|---|---|
author | Sandrine Bailleux <sandrine.bailleux@arm.com> | Fri Apr 26 10:35:35 2019 +0000 |
committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | Fri Apr 26 10:35:35 2019 +0000 |
tree | d8846da8f9af434f1a4ade0f6cd97fd846a63953 | |
parent | 65e6d515a36ac0f0e18383c24119de71225f7cf7 [diff] [blame] |
Modified project settings
diff --git a/project.config b/project.config index 04d6e80..3936bd3 100644 --- a/project.config +++ b/project.config
@@ -1,7 +1,7 @@ [access] inheritFrom = All-Projects [submit] - action = rebase if necessary + action = merge always rejectEmptyCommit = true [receive] requireSignedOffBy = true