[Cmake-commits] CMake branch, master, updated. v3.11.2-856-ge21245e

[Kitware Robot]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  e21245ecafae78ff2fd3947f95cc30eac68ed5e8 (commit)
       via  82e01cbfc5c177920c8ee4c2cd141887efa0bbfe (commit)
      from  392f223d6055a8863064fabcc704442f29bd0c23 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e21245ecafae78ff2fd3947f95cc30eac68ed5e8
commit e21245ecafae78ff2fd3947f95cc30eac68ed5e8
Merge: 392f223 82e01cb
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed May 30 13:23:25 2018 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed May 30 09:23:39 2018 -0400

    Merge topic 'clarify-topic-rename'
    
    82e01cbfc5 Help: Clarify usage of Topic-rename
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !2110


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=82e01cbfc5c177920c8ee4c2cd141887efa0bbfe
commit 82e01cbfc5c177920c8ee4c2cd141887efa0bbfe
Author:     Craig Scott <craig.scott at crascit.com>
AuthorDate: Sat May 26 09:07:15 2018 +1000
Commit:     Craig Scott <craig.scott at crascit.com>
CommitDate: Wed May 30 06:56:11 2018 +1000

    Help: Clarify usage of Topic-rename

diff --git a/Help/dev/review.rst b/Help/dev/review.rst
index be02a1a..a524115 100644
--- a/Help/dev/review.rst
+++ b/Help/dev/review.rst
@@ -401,11 +401,14 @@ The ``Do: merge`` command accepts the following arguments:
   branch in the constructed merge commit message.
 
 Additionally, ``Do: merge`` extracts configuration from trailing lines
-in the MR description:
+in the MR description (the following have no effect if used in a MR
+comment instead):
 
 * ``Topic-rename: <topic>``: substitute ``<topic>`` for the name of
   the MR topic branch in the constructed merge commit message.
-  The ``-t`` option overrides this.
+  It is also used in merge commits constructed by ``Do: stage``.
+  The ``-t`` option to a ``Do: merge`` command overrides any topic
+  rename set in the MR description.
 
 .. _`CMake GitLab Project Masters`: https://gitlab.kitware.com/cmake/cmake/settings/members
 

-----------------------------------------------------------------------

Summary of changes:
 Help/dev/review.rst |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake