diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-12-13 19:23:34 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-12-13 19:23:34 +0000 |
| commit | 632450a4bd95c7f67f9968e57b317dc4b4704f5f (patch) | |
| tree | 61a98e9a4f405965b1c1c912da7f77da4dae42aa /doc | |
| parent | 75f9c98930d7eceb1458898c2e0633fe0768096f (diff) | |
| parent | 51cfd554aff461a4e8649459a53562e990321b3a (diff) | |
| download | gitlab-ce-632450a4bd95c7f67f9968e57b317dc4b4704f5f.tar.gz | |
Merge branch 'api-cherry-pick' into 'master'
Adds the ability to cherry pick a commit via the API. Right now it only supports to directly cherry pick a commit and not starting a MR from it. Shall we do that also for the API?
Closes #25450
See merge request !8047
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/api/commits.md | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/doc/api/commits.md b/doc/api/commits.md index 0170af00e0e..5c11d0f83bb 100644 --- a/doc/api/commits.md +++ b/doc/api/commits.md @@ -183,6 +183,44 @@ Example response: } ``` +## Cherry pick a commit + +> [Introduced][ce-8047] in GitLab 8.15. + +Cherry picks a commit to a given branch. + +``` +POST /projects/:id/repository/commits/:sha/cherry_pick +``` + +Parameters: + +| Attribute | Type | Required | Description | +| --------- | ---- | -------- | ----------- | +| `id` | integer/string | yes | The ID of a project or NAMESPACE/PROJECT_NAME owned by the authenticated user +| `sha` | string | yes | The commit hash | +| `branch` | string | yes | The name of the branch | + +```bash +curl --request POST --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" --form "branch=master" "https://gitlab.example.com/api/v3/projects/5/repository/commits/master/cherry_pick" +``` + +Example response: + +```json +{ + "id": "8b090c1b79a14f2bd9e8a738f717824ff53aebad", + "short_id": "8b090c1b", + "title": "Feature added", + "author_name": "Dmitriy Zaporozhets", + "author_email": "dmitriy.zaporozhets@gmail.com", + "created_at": "2016-12-12T20:10:39.000+01:00", + "committer_name": "Administrator", + "committer_email": "admin@example.com", + "message": "Feature added\n\nSigned-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>\n" +} +``` + ## Get the diff of a commit Get the diff of a commit in a project. @@ -438,3 +476,4 @@ Example response: ``` [ce-6096]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6096 "Multi-file commit" +[ce-8047]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8047 |