diff options
| author | tekkub <tekkub@gmail.com> | 2010-03-03 01:22:48 -0700 |
|---|---|---|
| committer | tekkub <tekkub@gmail.com> | 2010-03-03 01:26:12 -0700 |
| commit | 05c9a6c1bd868d0429bb2a722d6bf23cc907d260 (patch) | |
| tree | 20b117f67911adf776c88b85fa4e3fb69534973f /_posts/2009-06-11-forking.textile | |
| parent | eb2728d5ed4841da11e809051c0995c1f5a6b03b (diff) | |
Some forking fixes
Diffstat (limited to '_posts/2009-06-11-forking.textile')
| -rw-r--r-- | _posts/2009-06-11-forking.textile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/_posts/2009-06-11-forking.textile b/_posts/2009-06-11-forking.textile index 8126b4a..00bfd86 100644 --- a/_posts/2009-06-11-forking.textile +++ b/_posts/2009-06-11-forking.textile @@ -26,7 +26,7 @@ Once the clone is complete your repo will have a remote named "origin" that poin $ git remote add upstream git://github.com/pjhyett/github-services.git $ git fetch upstream</pre> -Note that we used the public clone URL for upstream, so we can't push changes directly to it. We probably don't have permission to do that anyway, which is why we're creating a fork in the first place. +Note that we used the public clone URL for upstream, so we can't push changes directly to it. We probably don't have permission to do that anyway, which is why we're creating a fork in the first place. If the upstream repo is private, you must use its private URL. h2. Pushing your changes @@ -40,7 +40,7 @@ _Note that some projects do not accept pull requests. Make sure you submit your h2. Pulling in upstream changes Some time has passed, the upstream repo has changed and you want to update your fork before you submit a new patch. There are two ways to do this: -<pre class="terminal">$ git fetch upstream master +<pre class="terminal">$ git fetch upstream $ git merge upstream/master</pre> <pre class="terminal">$ git pull upstream master</pre> |