Show More
@@ -1,52 +1,82 | |||||
1 | .. _contributing: |
|
1 | .. _contributing: | |
2 |
|
2 | |||
3 | ============================ |
|
3 | ============================ | |
4 | How to contribute to IPython |
|
4 | How to contribute to IPython | |
5 | ============================ |
|
5 | ============================ | |
6 |
|
6 | |||
7 | Overview |
|
7 | Overview | |
8 | ======== |
|
8 | ======== | |
9 |
|
9 | |||
10 | IPython development is done using Git [Git]_ and Github.com [Github.com]_. |
|
10 | IPython development is done using Git [Git]_ and Github.com [Github.com]_. | |
11 | This makes it easy for people to contribute to the development of IPython. |
|
11 | This makes it easy for people to contribute to the development of IPython. | |
12 | There are several ways in which you can join in. |
|
12 | There are several ways in which you can join in. | |
13 |
|
13 | |||
14 |
|
14 | |||
15 | Merging a branch into trunk |
|
15 | Merging a branch into trunk | |
16 | =========================== |
|
16 | =========================== | |
17 |
|
17 | |||
18 | Core developers, who ultimately merge any approved branch (from themselves, |
|
18 | Core developers, who ultimately merge any approved branch (from themselves, | |
19 | another developer, or any third-party contribution) will typically use |
|
19 | another developer, or any third-party contribution) will typically use | |
20 | :command:`git merge` to merge the branch into the trunk and push it to the main |
|
20 | :command:`git merge` to merge the branch into the trunk and push it to the main | |
21 | Git repository. There are a number of things to keep in mind when doing this, |
|
21 | Git repository. There are a number of things to keep in mind when doing this, | |
22 | so that the project history is easy to understand in the long run, and that |
|
22 | so that the project history is easy to understand in the long run, and that | |
23 | generating release notes is as painless and accurate as possible. |
|
23 | generating release notes is as painless and accurate as possible. | |
24 |
|
24 | |||
25 | * When you merge any non-trivial functionality (from one small bug fix to a |
|
25 | * When you merge any non-trivial functionality (from one small bug fix to a | |
26 | big feature branch), please remember to always edit the appropriate file in |
|
26 | big feature branch), please remember to always edit the appropriate file in | |
27 | the :ref:`What's new <whatsnew_index>` section of our documentation. |
|
27 | the :ref:`What's new <whatsnew_index>` section of our documentation. | |
28 | Ideally, the author of the branch should provide this content when they |
|
28 | Ideally, the author of the branch should provide this content when they | |
29 | submit the branch for review. But if they don't it is the responsibility of |
|
29 | submit the branch for review. But if they don't it is the responsibility of | |
30 | the developer doing the merge to add this information. |
|
30 | the developer doing the merge to add this information. | |
31 |
|
31 | |||
32 | * When merges are done, the practice of putting a summary commit message in |
|
32 | * When merges are done, the practice of putting a summary commit message in | |
33 | the merge is *extremely* useful. It is probably easiest if you simply use |
|
33 | the merge is *extremely* useful. It is probably easiest if you simply use | |
34 | the same list of changes that were added to the :ref:`What's new |
|
34 | the same list of changes that were added to the :ref:`What's new | |
35 | <whatsnew_index>` section of the documentation. |
|
35 | <whatsnew_index>` section of the documentation. | |
36 |
|
36 | |||
37 | * It's important that we remember to always credit who gave us something if |
|
37 | * It's important that we remember to always credit who gave us something if | |
38 | it's not the committer. In general, we have been fairly good on this front, |
|
38 | it's not the committer. In general, we have been fairly good on this front, | |
39 | this is just a reminder to keep things up. As a note, if you are ever |
|
39 | this is just a reminder to keep things up. As a note, if you are ever | |
40 | committing something that is completely (or almost so) a third-party |
|
40 | committing something that is completely (or almost so) a third-party | |
41 | contribution, do the commit as:: |
|
41 | contribution, do the commit as:: | |
42 |
|
42 | |||
43 | $ git commit --author="Someone Else" |
|
43 | $ git commit --author="Someone Else <who@somewhere.com>" | |
44 |
|
44 | |||
45 | This way it will show that name separately in the log, which makes it even |
|
45 | This way it will show that name separately in the log, which makes it even | |
46 | easier to spot. Obviously we often rework third party contributions |
|
46 | easier to spot. Obviously we often rework third party contributions | |
47 |
extensively |
|
47 | extensively, but this is still good to keep in mind for cases when we don't | |
48 | touch the code too much. |
|
48 | touch the code too much. | |
49 |
|
49 | |||
50 |
|
50 | |||
51 | .. [Git] The Git version control system. |
|
51 | .. [Git] The Git version control system. | |
52 | .. [Github.com] Github.com. http://github.com |
|
52 | .. [Github.com] Github.com. http://github.com | |
|
53 | ||||
|
54 | ||||
|
55 | Commit messages | |||
|
56 | =============== | |||
|
57 | ||||
|
58 | Good commit messages are very important; they provide a verbal account of what | |||
|
59 | happened that is often invaluable for anyone trying to undestand the intent of | |||
|
60 | a commit later on (including the original author!). And git's log command is a | |||
|
61 | very versatile and powerful tool, capable of extracting a lot of information | |||
|
62 | from the commit logs, so it's important that these logs actually have useful | |||
|
63 | information in them. | |||
|
64 | ||||
|
65 | In short, a commit message should have the form:: | |||
|
66 | ||||
|
67 | One line summary. | |||
|
68 | <THIS LINE MUST BE LEFT BLANK> | |||
|
69 | More detailed description of what was done, using multiple lines and even | |||
|
70 | more than one paragraph if needed. For very simple commits this may not be | |||
|
71 | necessary, but non-trivial ones should always have it. | |||
|
72 | ||||
|
73 | Closes gh-NNN. # if the commit closes issue NNN on github. | |||
|
74 | ||||
|
75 | This format is understood by many git tools that expect a *single line* | |||
|
76 | summary, so please do respect it. | |||
|
77 | ||||
|
78 | An excellent reference on commits message is `this blog post`_, please take a | |||
|
79 | moment to read it (it's short but very informative). | |||
|
80 | ||||
|
81 | .. _this blog post: http://who-t.blogspot.com/2009/12/on-commit-messages.html | |||
|
82 |
General Comments 0
You need to be logged in to leave comments.
Login now