aboutsummaryrefslogtreecommitdiffstats
path: root/README.md
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-02-17 19:25:25 +0800
committerobscuren <geffobscura@gmail.com>2015-02-17 19:25:25 +0800
commitc934222a8089b19587242a3b0bc71ea0aec1d5ef (patch)
treec301b2c6d74611f7b70a9907e0adce0498b98fc7 /README.md
parent8135752a32837748e6d4a986912131736b1a0aa0 (diff)
parent643eda5c2d3190147bc55ef27c4ce241c7c59da2 (diff)
downloaddexon-c934222a8089b19587242a3b0bc71ea0aec1d5ef.tar
dexon-c934222a8089b19587242a3b0bc71ea0aec1d5ef.tar.gz
dexon-c934222a8089b19587242a3b0bc71ea0aec1d5ef.tar.bz2
dexon-c934222a8089b19587242a3b0bc71ea0aec1d5ef.tar.lz
dexon-c934222a8089b19587242a3b0bc71ea0aec1d5ef.tar.xz
dexon-c934222a8089b19587242a3b0bc71ea0aec1d5ef.tar.zst
dexon-c934222a8089b19587242a3b0bc71ea0aec1d5ef.zip
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
Diffstat (limited to 'README.md')
-rw-r--r--README.md3
1 files changed, 3 insertions, 0 deletions
diff --git a/README.md b/README.md
index 70bb058dd..6dd2182de 100644
--- a/README.md
+++ b/README.md
@@ -29,6 +29,7 @@ For further, detailed, build instruction please see the [Wiki](https://github.co
Automated (dev) builds
======================
+* [[Docker](https://registry.hub.docker.com/u/ethereum/client-go/)]
* [[OS X](http://build.ethdev.com/builds/OSX%20Go%20develop%20branch/Mist-OSX-latest.dmg)]
* [Windows] Coming soon&trade;
* [Linux] Coming soon&trade;
@@ -91,6 +92,8 @@ are ignored (use gofmt!). 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.
+For dependency management, we use [godep](https://github.com/tools/godep). After installing with `go get github.com/tools/godep`, run `godep restore` to ensure that changes to other repositories do not break the build. To update a dependency version (for example, to include a new upstream fix), run `go get -u <foo/bar>` then `godep update <foo/...>`. To track a new dependency, add it to the project as normal than run `godep save ./...`. Changes to the Godeps folder should be manually verified then commited.
+
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.