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 c0d21d763b13e280ccf7a387ba690650db014646 (commit)
via 2fa33613844420af3ebebb943a5fadf0c4c32d3a (commit)
from 2d01dcab29aaa60e905e828d4a07d2f72f7eeb20 (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=c0d21d763b13e280ccf7a387ba690650db014646
commit c0d21d763b13e280ccf7a387ba690650db014646
Merge: 2d01dca 2fa3361
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Aug 30 17:16:26 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Fri Aug 30 13:16:33 2019 -0400
Merge topic 'doc-contrib-topic-name'
2fa3361384 CONTRIBUTING: Clarify creation of topic branch from target branch
Acked-by: Kitware Robot <kwro...@kitware.com>
Acked-by: Kyle Edwards <kyle.edwa...@kitware.com>
Merge-request: !3761
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2fa33613844420af3ebebb943a5fadf0c4c32d3a
commit 2fa33613844420af3ebebb943a5fadf0c4c32d3a
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Aug 30 11:12:30 2019 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Fri Aug 30 11:12:30 2019 -0400
CONTRIBUTING: Clarify creation of topic branch from target branch
The sentence "Base all new work on the upstream master branch." may be
interpreted to mean that one should commit on a 'master' branch.
Precede this with an explicit step for creating a topic branch.
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 7e71111..7983be1 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -27,14 +27,15 @@ To contribute patches:
#. Run `Utilities/SetupForDevelopment.sh`_ for local git configuration.
#. See `Building CMake`_ for building CMake locally.
#. See the `CMake Source Code Guide`_ for coding guidelines.
-#. Base all new work on the upstream ``master`` branch.
+#. Create a topic branch named suitably for your work.
+ Base all new work on the upstream ``master`` branch.
Base work on the upstream ``release`` branch only if it fixes a
regression or bug in a feature new to that release.
If in doubt, prefer ``master``. Reviewers may simply ask for
a rebase if deemed appropriate in particular cases.
#. Create commits making incremental, distinct, logically complete changes
with appropriate `commit messages`_.
-#. Push a topic branch to a personal repository fork on GitLab.
+#. Push the topic branch to a personal repository fork on GitLab.
#. Create a GitLab Merge Request targeting the upstream ``master`` branch
(even if the change is intended for merge to the ``release`` branch).
Check the box labelled "Allow commits from members who can merge to the
-----------------------------------------------------------------------
Summary of changes:
CONTRIBUTING.rst | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
