diff options
| author | Shawn Pearce <sop@google.com> | 2013-04-22 18:08:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-04-22 18:08:35 +0000 |
| commit | c36a0e01d2d4ce09a48ef650dec9c8e3da8c48d7 (patch) | |
| tree | 683ac91fbe3960f41af2e10e4e6151d83ef52b4e /Documentation | |
| parent | 3f7aa28c0c4b78c0489aee3ba954f1b861413931 (diff) | |
| parent | bfa06218e4175a20ed11bb5dae36f37ae6829dc2 (diff) | |
Merge "Add refs/for/<branch>%submit to auto-merge during push"
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/access-control.txt | 4 | ||||
| -rw-r--r-- | Documentation/user-upload.txt | 20 |
2 files changed, 24 insertions, 0 deletions
diff --git a/Documentation/access-control.txt b/Documentation/access-control.txt index 5cc053fc72..e38df7589c 100644 --- a/Documentation/access-control.txt +++ b/Documentation/access-control.txt @@ -652,6 +652,10 @@ In order to submit, all labels (such as `Verified` and `Code-Review`, above) must enable submit, and also must not block it. See above for details on each label. +To link:user-upload.html#auto_merge[immediately submit a change on push] +the caller needs to have the Submit permission on `refs/for/<ref>` +(e.g. on `refs/for/refs/heads/master`). + [[category_view_drafts]] View Drafts diff --git a/Documentation/user-upload.txt b/Documentation/user-upload.txt index 55ab89521a..83ce6ce393 100644 --- a/Documentation/user-upload.txt +++ b/Documentation/user-upload.txt @@ -333,6 +333,26 @@ grant nothing at all. This ensures that accidental pushes don't make undesired changes to the public repository. +[[auto_merge]] +Auto-Merge during Push +~~~~~~~~~~~~~~~~~~~~~~ + +Changes can be directly submitted on push. This is primarily useful +for teams that don't want to do code review but want to use Gerrit's +submit strategies to handle contention on busy branches. Using +`%submit` creates a change and submits it immediately, if the caller +has link:access-control.html#category_submit[Submit] permission on +`refs/for/<ref>` (e.g. on `refs/for/refs/heads/master`). + +==== + git push ssh://john.doe@git.example.com:29418/kernel/common HEAD:refs/for/master%submit +==== + +On auto-merge of a change neither labels nor submit rules are checked. +If the merge fails the change stays open, but when pushing a new patch +set the merge can be reattempted by using `%submit` again. + + repo upload ----------- |