summaryrefslogtreecommitdiff
path: root/_posts/2009-06-16-forking.textile
diff options
context:
space:
mode:
authortekkub <tekkub@gmail.com>2009-07-27 01:49:54 -0600
committertekkub <tekkub@gmail.com>2009-07-27 01:49:54 -0600
commitb5a95e8c10b04c5d2add56c9d9815113149adf3f (patch)
treec3387f5b5aeaeb6f8f140665e3af5ee612137cd4 /_posts/2009-06-16-forking.textile
parent8352e9538ecd1a66a44239a3e775660d91f20d6d (diff)
h3. --> h2.
Diffstat (limited to '_posts/2009-06-16-forking.textile')
-rw-r--r--_posts/2009-06-16-forking.textile10
1 files changed, 5 insertions, 5 deletions
diff --git a/_posts/2009-06-16-forking.textile b/_posts/2009-06-16-forking.textile
index 75299bb..b65c4c8 100644
--- a/_posts/2009-06-16-forking.textile
+++ b/_posts/2009-06-16-forking.textile
@@ -10,7 +10,7 @@ In this guide, we will use "github-services":http://github.com/pjhyett/github-se
Note that this works for pulling from a forked repository to the original, as well.
-h3. Setting up
+h2. Setting up
Naturally, the first thing you must do is create your fork. To do this, you simply click the !http://github.com/images/modules/repos/fork_button.png! button on the project's page. When the fork has completed, you will be presented with your new repo information.
@@ -24,7 +24,7 @@ $ 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.
-h3. Pushing your changes
+h2. Pushing your changes
Now that we've got our fork, we need to make a few changes and commit them locally. Once you've done this, it's time to push your updated branch.
<pre>$ git push origin master</pre>
@@ -33,7 +33,7 @@ After you've pushed your commit(s) you need to inform the project owner of the c
_Note that some projects do not accept pull requests. Make sure you submit your request to the place they want it, or you will probably just be ignored._
-h3. Pulling in upstream changes
+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>$ git fetch upstream master
@@ -49,11 +49,11 @@ Now that your local branch has been updated, you can commit, push, and send a pu
You may wish to do the fetch and merge manually, instead of letting git-pull do it for you. This can sometimes help avoid headaches caused by mysterious merge conflicts.
-h3. Deleting the forked repository
+h2. Deleting the forked repository
To remove the fork, just delete it like any repo: click the "Edit" button next to "pull request", then at the bottom of the page there will be a "Delete This Repository…" link.
-h3. Additional resources
+h2. Additional resources
* "github-gem":http://github.com/defunkt/github-gem - Handy tool for pulling in forked branches
* "Rails on the Run forking tutorial":http://railsontherun.com/2008/3/3/how-to-use-github-and-submit-a-patch \ No newline at end of file