diff options
| author | Brad King <brad.king@kitware.com> | 2016-06-08 16:56:05 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-06-08 16:56:05 (GMT) |
| commit | 5804068c220e2f9870dbcb24ee68eb610c9b4ff4 (patch) | |
| tree | b61ffa4b42896d6da92ca68abfbc18f0e97e0bab | |
| parent | 5a13dc0b6e462745e12946e209b815131ea47f25 (diff) | |
| parent | 1b18180ed4a808f706c4df2f03826e7e9804487b (diff) | |
| download | CMake-5804068c220e2f9870dbcb24ee68eb610c9b4ff4.zip CMake-5804068c220e2f9870dbcb24ee68eb610c9b4ff4.tar.gz CMake-5804068c220e2f9870dbcb24ee68eb610c9b4ff4.tar.bz2 | |
Merge topic 'doc-ctest_update'
1b18180e Help: Document CTest Git fetch-and-reset behavior
558e4d1e Help: Document ctest_update branch following behavior
| -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 74af1f7..b205bca 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 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. |