diff options
| author | Brad King <brad.king@kitware.com> | 2016-06-08 10:03:41 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-06-08 10:03:41 -0400 |
| commit | b55039ce5baeb76f0ad9599ceb85ae65bc20b2d7 (patch) | |
| tree | 4d765b20b72e984ecdc154f21fec1f8f926a70a4 | |
| parent | fb30b1a2822a43a26368da8245d107c347526b04 (diff) | |
| parent | 1b18180ed4a808f706c4df2f03826e7e9804487b (diff) | |
| download | cmake-b55039ce5baeb76f0ad9599ceb85ae65bc20b2d7.tar.gz | |
Merge branch 'doc-ctest_update' into release
| -rw-r--r-- | Help/command/ctest_update.rst | 4 | ||||
| -rw-r--r-- | Help/manual/ctest.1.rst | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/Help/command/ctest_update.rst b/Help/command/ctest_update.rst index 74af1f7b73..b205bca933 100644 --- a/Help/command/ctest_update.rst +++ b/Help/command/ctest_update.rst @@ -25,3 +25,7 @@ The options are: have otherwise printed to the console. CTest will still report the new revision of the repository and any conflicting files that were found. + +The update always follows the version control branch currently checked +out in the source directory. See the :ref:`CTest Update Step` +documentation for more information. diff --git a/Help/manual/ctest.1.rst b/Help/manual/ctest.1.rst index 1179f5665c..e797333002 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. |