[Cmake-commits] CMake branch, next, updated. v3.6.0-rc1-120-g15e1ee7

[Brad King]

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, next has been updated
       via  15e1ee72d6d13ab02cbfd727a5702a7ce8bd18a2 (commit)
       via  1b18180ed4a808f706c4df2f03826e7e9804487b (commit)
      from  fcd706a47df8800fb7ad6cfac783ea40f184f4e5 (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=15e1ee72d6d13ab02cbfd727a5702a7ce8bd18a2
commit 15e1ee72d6d13ab02cbfd727a5702a7ce8bd18a2
Merge: fcd706a 1b18180
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 8 09:59:10 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jun 8 09:59:10 2016 -0400

    Merge topic 'doc-ctest_update' into next
    
    1b18180e Help: Document CTest Git fetch-and-reset behavior


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1b18180ed4a808f706c4df2f03826e7e9804487b
commit 1b18180ed4a808f706c4df2f03826e7e9804487b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 8 09:58:43 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jun 8 09:58:43 2016 -0400

    Help: Document CTest Git fetch-and-reset behavior

diff --git a/Help/manual/ctest.1.rst b/Help/manual/ctest.1.rst
index 1179f56..e797333 100644
--- a/Help/manual/ctest.1.rst
+++ b/Help/manual/ctest.1.rst
@@ -589,6 +589,11 @@ Configuration settings to specify the version control tool include:
   * `CTest Script`_ variable: :variable:`CTEST_GIT_COMMAND`
   * :module:`CTest` module variable: ``GITCOMMAND``
 
+  The source tree is updated by ``git fetch`` followed by
+  ``git reset --hard`` to the ``FETCH_HEAD``.  The result is the same
+  as ``git pull`` except that any local moficiations are overwritten.
+  Use ``GITUpdateCustom`` to specify a different approach.
+
 ``GITInitSubmodules``
   If set, CTest will update the repository's submodules before updating.
 

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

Summary of changes:
 Help/manual/ctest.1.rst |    5 +++++
 1 file changed, 5 insertions(+)


hooks/post-receive
-- 
CMake