config-project-config: Add missing 'rebase always'

Change-Id: I499c092d1ea7947f77afb3687459635064004111
This commit is contained in:
David Pursehouse 2019-07-16 08:49:29 +09:00
parent 99aeeeaf0d
commit 91203c9257

View File

@ -248,7 +248,7 @@ are 'true', 'false', or 'INHERIT'. Default is 'INHERIT'.
- 'action': defines the link:project-configuration.html#submit_type[submit type]. Valid
values are 'fast forward only', 'merge if necessary', 'rebase if necessary',
'merge always' and 'cherry pick'. The default is 'merge if necessary'.
'rebase always', 'merge always' and 'cherry pick'. The default is 'merge if necessary'.
- 'matchAuthorToCommitterDate': Defines whether to the author date will be changed to match the
submitter date upon submit, so that git log shows when the change was submitted instead of when the