[Cmake-commits] CMake branch, master, updated. v3.8.1-1205-g2e6cbd9
Kitware Robot
kwrobot at kitware.com
Wed May 17 15:15:04 EDT 2017
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 2e6cbd987119f74fe3454213a73ef049bd1b0926 (commit)
via 1c25adb210f709e228c86a778a8a3213b251a2a9 (commit)
from 3f25f873f8f0cd4c9c8d5dce29535c6b2757eaea (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=2e6cbd987119f74fe3454213a73ef049bd1b0926
commit 2e6cbd987119f74fe3454213a73ef049bd1b0926
Merge: 3f25f87 1c25adb
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed May 17 19:10:50 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed May 17 15:10:54 2017 -0400
Merge topic 'note-unstage-before-update'
1c25adb2 Help/dev: note that unstaging before an update is unnecessary
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !863
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c25adb210f709e228c86a778a8a3213b251a2a9
commit 1c25adb210f709e228c86a778a8a3213b251a2a9
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Wed May 17 11:19:57 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed May 17 13:05:00 2017 -0400
Help/dev: note that unstaging before an update is unnecessary
diff --git a/Help/dev/review.rst b/Help/dev/review.rst
index 3db1f40..c4122d4 100644
--- a/Help/dev/review.rst
+++ b/Help/dev/review.rst
@@ -261,6 +261,10 @@ until one of the following occurs:
and the MR cannot be merged into the topic stage again due to conflicts.
* A developer or the submitter posts an explicit ``Do: unstage`` command.
+ This is useful to remove a MR from the topic stage when one is not ready
+ to push an update to the MR topic branch. It is unnecessary to explicitly
+ unstage just before or after pushing an update because the push will cause
+ the MR to be unstaged automatically.
* The MR is closed.
-----------------------------------------------------------------------
Summary of changes:
Help/dev/review.rst | 4 ++++
1 file changed, 4 insertions(+)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list