From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 52D35138A1F for ; Wed, 29 Jan 2014 11:39:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 01A38E0B2D; Wed, 29 Jan 2014 11:39:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 93460E0B2D for ; Wed, 29 Jan 2014 11:39:51 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BFD3533F68B for ; Wed, 29 Jan 2014 11:39:50 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 8397618191 for ; Wed, 29 Jan 2014 11:39:49 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1390995565.5614ffab3d353ff5506040b3005a5458b36c48be.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: / X-VCS-Repository: proj/sci X-VCS-Files: CONTRIBUTING.md X-VCS-Directories: / X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 5614ffab3d353ff5506040b3005a5458b36c48be X-VCS-Branch: master Date: Wed, 29 Jan 2014 11:39:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a6e6b85f-df1b-44d7-b823-1a1449d091dc X-Archives-Hash: 18a8fbb410ff281a98546b994e34b0b2 commit: 5614ffab3d353ff5506040b3005a5458b36c48be Author: Justin Lecher gentoo org> AuthorDate: Wed Jan 29 11:39:25 2014 +0000 Commit: Justin Lecher gentoo org> CommitDate: Wed Jan 29 11:39:25 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=5614ffab Be more precise on the branching Signed-off-by: Justin Lecher gentoo.org> --- CONTRIBUTING.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8f02ccc..99561d0 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -64,9 +64,9 @@ In order to send pull request and ask for inclusion of your changes you need to hub fork ###Branch out for contribution -It is always convenient for development as well as for the review and merging process, if the development is done in branches. +It is always convenient for development as well as for the review and merging process, if the development is done in branches. Let's branch the overlay into a local branch named PACKAGE_NAME. - git checkout -b my-feature master + git checkout -b PACKAGE_NAME master For the fastest process during merging it is best to have a single branch per package. @@ -83,9 +83,9 @@ Once *all* reported problems are resolved, you can commit it repo-commit "Here we write a comprehensible commit message" ###Push to Github and make a pull request -Next we push back the changes to our fork and send a pull-request to the overlay maintainers. +Next we push back the changes in the PACKAGE_NAME branch to our fork and send a pull-request to the overlay maintainers. - hub push YOUR_GITHUB_USER + hub push YOUR_GITHUB_USER PACKAGE_NAME hub pull-request Lastly you need to wait for review comments and the merge of your work. If you feel that they are slacking, don't bother to ping them again. In case you need to include some improvements, just commit your work again using *repo-commit* and push it again to your fork. No need to send another pull-request as your new changes will be added to the original one.