From 6da0a24834870a2405a0d483fc759e19c9f897a2 Mon Sep 17 00:00:00 2001 From: catchamonkey Date: Thu, 26 May 2011 17:19:41 +0100 Subject: Added a small section on auto merging because it's an epic feature --- _posts/2010-08-29-pull-requests.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/_posts/2010-08-29-pull-requests.md b/_posts/2010-08-29-pull-requests.md index 78a9238..f1a3737 100644 --- a/_posts/2010-08-29-pull-requests.md +++ b/_posts/2010-08-29-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: $ git push origin master +#### 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 -- cgit v1.3.1 From 398c9cd6199c4873ca318af9f3f50ff4f62a1558 Mon Sep 17 00:00:00 2001 From: Cameron McEfee Date: Fri, 27 May 2011 12:31:55 -0700 Subject: Update global styles to 58b228705822e1ce832e2b6b4f415cb8649bb96e --- _layouts/default.html | 26 +++++------- shared/css/documentation.css | 94 ++++++++++++++++++++++++++---------------- shared/images/footer_logo.png | Bin 0 -> 4430 bytes 3 files changed, 68 insertions(+), 52 deletions(-) create mode 100644 shared/images/footer_logo.png diff --git a/_layouts/default.html b/_layouts/default.html index 67a0c67..9dc7906 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -77,25 +77,19 @@ sidebar_cats: -
+

Popular Guides

-
+
    {% for post in site.categories.popular reversed %}
  • -- cgit v1.3.1 From 07b13a34b4af4d58e646712123ecc4aceae2c7a4 Mon Sep 17 00:00:00 2001 From: Cameron McEfee Date: Wed, 1 Jun 2011 11:15:18 -0700 Subject: update footer api link --- _layouts/default.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_layouts/default.html b/_layouts/default.html index 9dc7906..c4ec733 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -84,7 +84,7 @@ sidebar_cats:
  • The GitHub Blog
  • Support
  • Contact
    • -
  • API
    • +
  • API

© 2011 GitHub Inc. All rights reserved

-- cgit v1.3.1