Merge docs about "requireChangeId" into "config-project-config.txt"

Change-Id: I829c274750c7c5378845de5aabee88eafe46b591
This commit is contained in:
Changcheng Xiao 2019-01-15 18:30:42 +01:00 committed by xchangcheng
parent 81a0df9426
commit 89aa675efd
2 changed files with 23 additions and 22 deletions

View File

@ -159,11 +159,27 @@ property is inherited from the parent project.
[[receive.requireChangeId]]receive.requireChangeId::
+
Controls whether or not the Change-Id must be included in the commit message
in the last paragraph. Default is `INHERIT`, which means that this property
is inherited from the parent project. The global default for new hosts
is `true`
+
The `Require Change-Id in commit message` option defines whether a
link:user-changeid.html[Change-Id] in the commit message is required
for pushing a commit for review. If this option is set, trying to push
a commit for review that doesn't contain a Change-Id in the commit
message fails with link:error-missing-changeid.html[missing Change-Id
in commit message footer].
It is recommended to set this option and use a
link:user-changeid.html#create[commit-msg hook] (or other client side
tooling like EGit) to automatically generate Change-Id's for new
commits. This way the Change-Id is automatically in place when changes
are reworked or rebased and uploading new patch sets gets easy.
If this option is not set, commits can be uploaded without a Change-Id,
but then users have to remember to copy the assigned Change-Id from the
change screen and insert it manually into the commit message when they
want to upload a second patch set.
Default is `INHERIT`, which means that this property is inherited from
the parent project. The global default for new hosts is `true`
This option is deprecated and future releases will behave as if this
is always `true`.

View File

@ -67,23 +67,8 @@ create new change for all not intarget].
[[require-change-id]]
=== Require Change-Id
The `Require Change-Id in commit message` option defines whether a
link:user-changeid.html[Change-Id] in the commit message is required
for pushing a commit for review. If this option is set, trying to push
a commit for review that doesn't contain a Change-Id in the commit
message fails with link:error-missing-changeid.html[missing Change-Id
in commit message footer].
It is recommended to set this option and use a
link:user-changeid.html#create[commit-msg hook] (or other client side
tooling like EGit) to automatically generate Change-Id's for new
commits. This way the Change-Id is automatically in place when changes
are reworked or rebased and uploading new patch sets gets easy.
If this option is not set, commits can be uploaded without a Change-Id,
but then users have to remember to copy the assigned Change-Id from the
change screen and insert it manually into the commit message when they
want to upload a second patch set.
See details at
link:config-project-config.html#receive.requireChangeId[require change id].
=== Maximum Git Object Size Limit