Browse code

Merge pull request #7115 from jsafrane/devel/hacking-kubernetes

Merged by openshift-bot

OpenShift Bot authored on 2016/02/10 00:57:42
Showing 1 changed files
... ...
@@ -202,8 +202,15 @@ If you are not updating packages you should not need godep installed.
202 202
 You can use `hack/cherry-pick.sh` to generate patches for Origin from upstream commits. To use
203 203
 this command, be sure to setup remote branches like https://gist.github.com/piscisaureus/3342247
204 204
 so that `git show origin/pr/<number>` displays information about your branch after a `git fetch`.
205
-You must also have the Kubernetes repository checked out in your GOPATH (visible as `../../../k8s.io/kubernetes`)
206
-and have no modified or uncommitted files in either repository.
205
+You must also have the Kubernetes repository checked out in your GOPATH (visible as `../../../k8s.io/kubernetes`),
206
+with openshift/kubernetes as a remote and fetched:
207
+
208
+    $ pushd $GOPATH/src/k8s.io/kubernetes
209
+    $ git remote add openshift https://github.com/openshift/kubernetes.git
210
+    $ git fetch openshift
211
+    $ popd
212
+
213
+There must be no modified or uncommitted files in either repository.
207 214
 
208 215
 To pull an upstream commit, run:
209 216