diff options
Diffstat (limited to 'Documentation/cmd-set-project.txt')
| -rw-r--r-- | Documentation/cmd-set-project.txt | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/Documentation/cmd-set-project.txt b/Documentation/cmd-set-project.txt index 059f063619..a0af9108bc 100644 --- a/Documentation/cmd-set-project.txt +++ b/Documentation/cmd-set-project.txt @@ -11,11 +11,11 @@ SYNOPSIS 'ssh' -p <port> <host> 'gerrit set-project' [--description <DESC> | -d <DESC>] [--submit-type <TYPE> | -t <TYPE>] - [--use|no-contributor-agreements | --ca|nca] - [--use|no-signed-off-by | --so|nso] - [--use|no-content-merge] - [--require|no-change-id | --id|nid] - [--project-state | --ps] + [--contributor-agreements <true|false|inherit>] + [--signed-off-by <true|false|inherit>] + [--content-merge <true|false|inherit>] + [--change-id <true|false|inherit>] + [--project-state <STATE> | --ps <STATE>] <NAME> DESCRIPTION @@ -63,26 +63,23 @@ Description values containing spaces should be quoted in single quotes For more details see link:project-setup.html#submit_type[Change Submit Actions]. ---use|no-content-merge:: +--content-merge:: If enabled, Gerrit will try to perform a 3-way merge of text file content when a file has been modified by both the destination branch and the change being submitted. This option only takes effect if submit type is not FAST_FORWARD_ONLY. ---use|no-contributor-agreements:: ---ca|nca:: +--contributor-agreements:: If enabled, authors must complete a contributor agreement on the site before pushing any commits or changes to this project. ---use|no-signed-off-by:: ---so|nso: +--signed-off-by:: If enabled, each change must contain a Signed-off-by line from either the author or the uploader in the commit message. ---require|no-change-id:: ---id|nid:: +--change-id:: Require a valid link:user-changeid.html[Change-Id] footer in any commit uploaded for review. This does not apply to commits pushed directly to a branch or tag. @@ -103,7 +100,7 @@ and use 'merge if necessary' as merge strategy: ==== $ ssh -p 29418 review.example.com gerrit set-project example --submit-type MERGE_IF_NECESSARY\ - --require-change-id --no-content-merge --project-state HIDDEN + --change-id true --content-merge false --project-state HIDDEN ==== GERRIT |