Sync changes from upstream repository

Hubot · Hubot · commit d49aa433eb32 · 2016-04-01T11:31:29.000-07:00
diff --git a/content/changes/2016-04-01-squash-api-preview.md b/content/changes/2016-04-01-squash-api-preview.md
@@ -0,0 +1,29 @@
+---
+title: Preview Squash Support for the Pull Request Merge API
+author_name: scottjg
+---
+
+With the [recent addition](https://github.com/blog/2141-squash-your-commits) of squashing Pull Requests via the merge button, we're adding support to squash Pull Requests in the API as well. You can squash a pull request in the [Pull Request Merge API][docs] during the preview period by providing a custom [media type][media-type] in the `Accept` header:
+
+    application/vnd.github.polaris-preview
+
+For example:
+
+``` command-line
+curl "https://api.github.com/repos/github/hubot/pulls/123/merge" \
+  -XPUT \
+  -H 'Authorization: token TOKEN' \
+  -H "Accept: application/vnd.github.polaris-preview" \
+  -d '{
+    "squash": true,
+    "commit_title": "Never tell me the odds"
+  }'
+```
+
+During the preview period, we may change aspects of these API methods based on developer feedback. We will announce the changes here on the developer blog, but we will not provide advance notice.
+
+If you have any questions or feedback, please [let us know][contact].
+
+[media-type]: /v3/media
+[docs]: /v3/pulls/#merge-a-pull-request-merge-button
+[contact]: https://github.com/contact?form%5Bsubject%5D=Squash+API+Preview
diff --git a/content/v3/pulls.md b/content/v3/pulls.md
@@ -187,9 +187,26 @@ Note: The response includes a maximum of 250 commits. If you are working with a
 
 Name | Type | Description
 -----|------|-------------
+{% if page.version == 'dotcom' or page.version >= 2.6 %}`commit_title`|`string`| Title for the automatic commit message.{% endif %}
 `commit_message`|`string`| Extra detail to append to automatic commit message.
 `sha`|`string`| SHA that pull request head must match to allow merge
+{% if page.version == 'dotcom' or page.version >= 2.6 %}`squash`|`boolean`| Commit a single commit to the head branch.{% endif %}
 
+{% if page.version == 'dotcom' or page.version >= 2.6 %}
+
+{{#tip}}
+ 
+The `commit_title` and `squash` parameters are currently available for developers to preview. During the preview period, the API may change without advance notice. Please see the [blog post](/changes/2016-04-01-squash-api-preview) for full details.
+
+To access the API during the preview period, you must provide a custom [media type](/v3/media) in the `Accept` header:
+
+```
+application/vnd.github.polaris-preview+json
+```
+
+{{/tip}}
+ 
+{% endif %}
 
 ### Response if merge was successful
 
