diff options
| author | Cameron McEfee <cameron@github.com> | 2011-06-01 11:26:48 -0700 |
|---|---|---|
| committer | Cameron McEfee <cameron@github.com> | 2011-06-01 11:26:48 -0700 |
| commit | 739339356b9c6dac01f3e00d7857fe439330920b (patch) | |
| tree | 76973ac2623768f7b8aa8d372d6106dc63e3c93a /_posts | |
| parent | 75e24fdca4e70e751332c491a4b60a712e12c9e0 (diff) | |
| parent | 07b13a34b4af4d58e646712123ecc4aceae2c7a4 (diff) | |
Merge branch 'gh-pages' into reorder-nav
Diffstat (limited to '_posts')
| -rw-r--r-- | _posts/2008-01-04-be-social.markdown | 2 | ||||
| -rw-r--r-- | _posts/2008-01-08-send-pull-requests.md | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/_posts/2008-01-04-be-social.markdown b/_posts/2008-01-04-be-social.markdown index 47a7c62..8e3ec81 100644 --- a/_posts/2008-01-04-be-social.markdown +++ b/_posts/2008-01-04-be-social.markdown @@ -37,7 +37,7 @@ One of the great features on GitHub is the ability to see what other people are </a> </div> - Who are these fine fellows? Why the founders of GitHub, of course! + Who are these fine fellows? We're the founders of GitHub, of course! 2. <span class="step-title">Follow a friend</span> diff --git a/_posts/2008-01-08-send-pull-requests.md b/_posts/2008-01-08-send-pull-requests.md index 464ca1b..d45bbf0 100644 --- a/_posts/2008-01-08-send-pull-requests.md +++ b/_posts/2008-01-08-send-pull-requests.md @@ -186,7 +186,7 @@ preformatted text blocks, and other formatting supported by Markdown. Once the pull request is deemed satisfactory, someone with push access to the destination repository must apply the changes and push the updated branch. -There are a variety of ways to accomplish this. Two popular methods are +There are a variety of ways to accomplish this. Three popular methods are described below. #### Fetch and Merge @@ -219,6 +219,12 @@ to feed into the `git-am` command: <span>$</span> git push origin master </pre> +#### Auto Merge + +In many cases it is possible to ask github to auto merge a pull request using +the merge button. This was made possible with the launch of Pull Requests 2.0 +and is covered in the [related blog post](https://github.com/blog/843-the-merge-button). + ## Closing a Pull Request Pull Requests are automatically closed when the requested commits are merged |