aboutsummaryrefslogtreecommitdiffstats
path: root/README.md
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-02-15 18:49:39 +0800
committerobscuren <geffobscura@gmail.com>2014-02-15 18:49:39 +0800
commit4a656eff7bbb17d590014eb258431b77d33a1ad1 (patch)
tree43f13ee067dc0d40e63bfd55140b9ac18f867b5c /README.md
parent73fd358d940418b15dec850f50407bd2e504d88c (diff)
downloaddexon-4a656eff7bbb17d590014eb258431b77d33a1ad1.tar
dexon-4a656eff7bbb17d590014eb258431b77d33a1ad1.tar.gz
dexon-4a656eff7bbb17d590014eb258431b77d33a1ad1.tar.bz2
dexon-4a656eff7bbb17d590014eb258431b77d33a1ad1.tar.lz
dexon-4a656eff7bbb17d590014eb258431b77d33a1ad1.tar.xz
dexon-4a656eff7bbb17d590014eb258431b77d33a1ad1.tar.zst
dexon-4a656eff7bbb17d590014eb258431b77d33a1ad1.zip
Added git flow explanation
Diffstat (limited to 'README.md')
-rw-r--r--README.md9
1 files changed, 7 insertions, 2 deletions
diff --git a/README.md b/README.md
index 3bf5697af..f6c49cc2d 100644
--- a/README.md
+++ b/README.md
@@ -43,9 +43,14 @@ This is the Developer package. For the development client please see
Contribution
============
-If you'd like to contribute to Ethereum Go please fork, fix, commit and
+If you'd like to contribute to Eth please fork, fix, commit and
send a pull request. Commits who do not comply with the coding standards
-are ignored.
+are ignored. If you send pull requests make absolute sure that you
+commit on the `develop` branch and that you do not merge to master.
+Commits that are directly based on master are simply ignored.
+
+To make life easier try [git flow](http://nvie.com/posts/a-successful-git-branching-model/) it sets
+this all up and streamlines your work flow.
Coding standards
================