diff options
| author | Brad King <brad.king@kitware.com> | 2017-03-22 12:08:25 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-03-22 12:08:30 (GMT) |
| commit | 7ebbe4f9d853a5823ef47a13b53ef7e1f469bd2e (patch) | |
| tree | 142ea84d810bc9db6a1296b47cdef84b5c13b19d /Help/dev | |
| parent | 564add478dd49f3c444b0f92b22991ea02da30b5 (diff) | |
| parent | 5fe3630677a9525428de0f5cd40d4846bd6b9113 (diff) | |
| download | CMake-7ebbe4f9d853a5823ef47a13b53ef7e1f469bd2e.zip CMake-7ebbe4f9d853a5823ef47a13b53ef7e1f469bd2e.tar.gz CMake-7ebbe4f9d853a5823ef47a13b53ef7e1f469bd2e.tar.bz2 | |
Merge topic 'doc-dev-topic-rename'
5fe36306 Help/dev: Document `Topic-rename:` description trailer
Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !602
Diffstat (limited to 'Help/dev')
| -rw-r--r-- | Help/dev/review.rst | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Help/dev/review.rst b/Help/dev/review.rst index 03f6cda..f55ec14 100644 --- a/Help/dev/review.rst +++ b/Help/dev/review.rst @@ -291,6 +291,13 @@ The ``Do: merge`` command accepts the following arguments: * ``-t <topic>``: substitute ``<topic>`` for the name of the MR topic branch in the constructed merge commit message. +Additionally, ``Do: merge`` extracts configuration from trailing lines +in the MR description: + +* ``Topic-rename: <topic>``: substitute ``<topic>`` for the name of + the MR topic branch in the constructed merge commit message. + The ``-t`` option overrides this. + .. _`CMake GitLab Project Masters`: https://gitlab.kitware.com/cmake/cmake/settings/members Close |