[gentoo-commits] proj/sci:master commit in: / - gentoo-commits

From:	Sebastien Fabbro <bicatali@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] proj/sci:master commit in: /
Date:	Tue, 28 Jan 2014 19:46:30
Message-Id:	`1390388455.2244b4474757c2c17d0d363764c400f6379f80c2.bicatali@gentoo`

1

commit:     2244b4474757c2c17d0d363764c400f6379f80c2

2

Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>

3

AuthorDate: Wed Jan 22 11:00:55 2014 +0000

4

Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>

5

CommitDate: Wed Jan 22 11:00:55 2014 +0000

6

URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=2244b447

7

8

Finalizing the Contribution instructions

9

10

Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

11

12

---

13

 CONTRIBUTING.md | 29 +++++++++++++++++------------

14

 1 file changed, 17 insertions(+), 12 deletions(-)

15

16

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md

17

index b156ca0..3d02fa6 100644

18

--- a/CONTRIBUTING.md

19

+++ b/CONTRIBUTING.md

20

@@ -5,7 +5,9 @@

21

22

 ###Requiered

23

24

-* Everybody who wants to contribute should own an account at [github](https://github.com/join). Please register yourself there.

25

+* **Account at [github](https://github.com/join)**

26

+

27

+Everybody who wants to contribute needs to own an account. Please register yourself there.

28

29

 ###Recommended

30

 * **Define echangelog user**

31

@@ -38,7 +40,7 @@ First clone the overlay

32

     hub clone gentoo-science/sci

33

34

35

-In order to send pull request and ask for inclusion of your changes you need to have your own fork of the overlay on github. You can do this by

36

+In order to send pull request and ask for inclusion of your changes you need to have your own fork of the overlay on github. You can do this by issuing

37

38

     cd sci

39

     hub fork

40

@@ -65,14 +67,14 @@ Next we push back the changes to our fork and send a pull-request to the overlay

41

     hub push YOUR_GITHUB_USER

42

     hub pull-request

43

44

-Lastly you need to wait for review comments and the merge of your work. In case you need to include some improvements, just commit your work again using repoman and push it again to your fork.

45

+Lastly you need to wait for review comments and the merge of your work. In case you need to include some improvements, just commit your work again using repoman and push it again to your fork. No need to send another pull-request as you new changes will be added the original one.

46

47

 ----

48

 ##For Maintainers

49

50

-**The merging of pull request should only be done by gentoo developers.**

51

+**The merging of pull request should only be done by gentoo developers!**

52

53

-If you feel that they are slacking, don't bother to ping them again.

54

+If you feel that they are slacking, don't bother to ping them again. If you like to become a dev yourself, prove some contribution and ping us via sci@g.o or on irc in #gentoo-science @ freenode.

55

56

 ###Prerequisite

57

58

@@ -82,17 +84,18 @@ Make sure you have both repos (github & gentoo.org) as remotes defined.

59

60

 should give

61

62

-> github	git@××××××.com:gentoo-science/sci.git (fetch)

63

+>github	git@××××××.com:gentoo-science/sci.git (fetch)

64

>

65

-> github	git@××××××.com:gentoo-science/sci.git (push)

66

+>github	git@××××××.com:gentoo-science/sci.git (push)

67

>

68

-> origin	git+ssh://git@×××××××××××××××××××.org/proj/sci.git (fetch)

69

+>origin	git+ssh://git@×××××××××××××××××××.org/proj/sci.git (fetch)

70

>

71

-> origin	git+ssh://git@×××××××××××××××××××.org/proj/sci.git (push)

72

+>origin	git+ssh://git@×××××××××××××××××××.org/proj/sci.git (push)

73

+

74

75

-In the beginning you should review the pull request on github directly and recommend as much improvements as possible. Once everything is fine or you like to fix the rest yourself, you can use the follow command to get the pull-request in a new branch in you repo.

76

+In the beginning you should review the pull request on github directly and recommend as much improvements as possible. Once everything is fine or you like to fix the rest yourself, simply can use the follow command to get the pull-request in a new branch in you repo.

77

78

-    hub checkout https://github.com/gentoo-science/sci/pull/176

79

+    hub checkout https://github.com/gentoo-science/sci/pull/PULLREQUEST-NUMBER

80

81

 Now check the package by building and installing it, and run *repoman* in the package dir. If this is also fine, merge the branch into the master

82

83

@@ -103,7 +106,9 @@ Finally use the script **merge-dualHEAD** from the *scripts* directory to merge

84

85

86

---

87

-####.

88

+####Contribution to the document

89

+Justin Lecher <jlec@g.o>

90

+

91

 This document is available under [Creative Commons Attribution ShareAlike 4.0](http://creativecommons.org/licenses/by-sa/4.0)

92

93

 ![ccsa-4 icon](http://i.creativecommons.org/l/by-sa/4.0/88x31.png)

1	commit: 2244b4474757c2c17d0d363764c400f6379f80c2
2	Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
3	AuthorDate: Wed Jan 22 11:00:55 2014 +0000
4	Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
5	CommitDate: Wed Jan 22 11:00:55 2014 +0000
6	URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=2244b447
7
8	Finalizing the Contribution instructions
9
10	Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
11
12	---
13	CONTRIBUTING.md \| 29 +++++++++++++++++------------
14	1 file changed, 17 insertions(+), 12 deletions(-)
15
16	diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
17	index b156ca0..3d02fa6 100644
18	--- a/CONTRIBUTING.md
19	+++ b/CONTRIBUTING.md
20	@@ -5,7 +5,9 @@
21
22	###Requiered
23
24	-* Everybody who wants to contribute should own an account at [github](https://github.com/join). Please register yourself there.
25	+* Account at [github](https://github.com/join)
26	+
27	+Everybody who wants to contribute needs to own an account. Please register yourself there.
28
29	###Recommended
30	* Define echangelog user
31	@@ -38,7 +40,7 @@ First clone the overlay
32	hub clone gentoo-science/sci
33
34
35	-In order to send pull request and ask for inclusion of your changes you need to have your own fork of the overlay on github. You can do this by
36	+In order to send pull request and ask for inclusion of your changes you need to have your own fork of the overlay on github. You can do this by issuing
37
38	cd sci
39	hub fork
40	@@ -65,14 +67,14 @@ Next we push back the changes to our fork and send a pull-request to the overlay
41	hub push YOUR_GITHUB_USER
42	hub pull-request
43
44	-Lastly you need to wait for review comments and the merge of your work. In case you need to include some improvements, just commit your work again using repoman and push it again to your fork.
45	+Lastly you need to wait for review comments and the merge of your work. In case you need to include some improvements, just commit your work again using repoman and push it again to your fork. No need to send another pull-request as you new changes will be added the original one.
46
47	----
48	##For Maintainers
49
50	-The merging of pull request should only be done by gentoo developers.
51	+The merging of pull request should only be done by gentoo developers!
52
53	-If you feel that they are slacking, don't bother to ping them again.
54	+If you feel that they are slacking, don't bother to ping them again. If you like to become a dev yourself, prove some contribution and ping us via sci@g.o or on irc in #gentoo-science @ freenode.
55
56	###Prerequisite
57
58	@@ -82,17 +84,18 @@ Make sure you have both repos (github & gentoo.org) as remotes defined.
59
60	should give
61
62	-> github git@××××××.com:gentoo-science/sci.git (fetch)
63	+>github git@××××××.com:gentoo-science/sci.git (fetch)
64	>
65	-> github git@××××××.com:gentoo-science/sci.git (push)
66	+>github git@××××××.com:gentoo-science/sci.git (push)
67	>
68	-> origin git+ssh://git@×××××××××××××××××××.org/proj/sci.git (fetch)
69	+>origin git+ssh://git@×××××××××××××××××××.org/proj/sci.git (fetch)
70	>
71	-> origin git+ssh://git@×××××××××××××××××××.org/proj/sci.git (push)
72	+>origin git+ssh://git@×××××××××××××××××××.org/proj/sci.git (push)
73	+
74
75	-In the beginning you should review the pull request on github directly and recommend as much improvements as possible. Once everything is fine or you like to fix the rest yourself, you can use the follow command to get the pull-request in a new branch in you repo.
76	+In the beginning you should review the pull request on github directly and recommend as much improvements as possible. Once everything is fine or you like to fix the rest yourself, simply can use the follow command to get the pull-request in a new branch in you repo.
77
78	- hub checkout https://github.com/gentoo-science/sci/pull/176
79	+ hub checkout https://github.com/gentoo-science/sci/pull/PULLREQUEST-NUMBER
80
81	Now check the package by building and installing it, and run repoman in the package dir. If this is also fine, merge the branch into the master
82
83	@@ -103,7 +106,9 @@ Finally use the script merge-dualHEAD from the scripts directory to merge
84
85
86	---
87	-####.
88	+####Contribution to the document
89	+Justin Lecher <jlec@g.o>
90	+
91	This document is available under [Creative Commons Attribution ShareAlike 4.0](http://creativecommons.org/licenses/by-sa/4.0)
92
93	![ccsa-4 icon](http://i.creativecommons.org/l/by-sa/4.0/88x31.png)

Gentoo Archives: gentoo-commits