Skip to content

brainfood / videojs-contrib-hls

Go to a project
Toggle navigation
Toggle navigation pinning
2236ca24 by David LaPalomento
Options

Merge pull request #324 from dmlap/accept-as-is3 

Reuse the merge commit for the changelog update
2 parents 6dbef597 f6412ae9
Inline Side-by-side
Showing 1 changed file with 5 additions and 5 deletions
...@@ -342,15 +342,15 @@ ...@@ -342,15 +342,15 @@
342 { "get": "{{meta.urls.repo_api}}/pulls/{{prNum}}", "desc": "Get the PR information", "id": "pr" }, 342 { "get": "{{meta.urls.repo_api}}/pulls/{{prNum}}", "desc": "Get the PR information", "id": "pr" },
343 { "get": "{{meta.urls.repo_api}}/pulls/{{prNum}}/commits", "desc": "Get the PR commits to access author info", "id": "prCommits" }, 343 { "get": "{{meta.urls.repo_api}}/pulls/{{prNum}}/commits", "desc": "Get the PR commits to access author info", "id": "prCommits" },
344 [ "git checkout -b {{pr.user.login}}-{{pr.head.ref}} {{pr.base.ref}}", "Create a new branch for merging the changes" ], 344 [ "git checkout -b {{pr.user.login}}-{{pr.head.ref}} {{pr.base.ref}}", "Create a new branch for merging the changes" ],
345 [ "git pull --rebase {{pr.head.repo.ssh_url}}", "Merge and rebase the changes"], 345 [ "git pull --rebase {{pr.head.repo.ssh_url}} {{pr.head.ref}}", "Merge and rebase the changes"],
346 [ "grunt test", "Run tests to make sure they still pass" ], 346 [ "git checkout {{pr.base.ref}}", "Check out the base branch" ],
347 { "prompt": "text", "id": "line", "desc": "Describe this change in one line" }, 347 { "prompt": "text", "id": "line", "desc": "Describe this change in one line" },
348 [ "git merge --no-ff {{pr.user.login}}-{{pr.head.ref}} -m {{line}}. Closes #{{prNum}}", "Merge the changes" ],
348 [ "grunt chg-add:'{{line}} ([view](https\\://github.com/{{meta.org}}/{{meta.name}}/pull/{{prNum}}))'", "Add a line to the changelog" ], 349 [ "grunt chg-add:'{{line}} ([view](https\\://github.com/{{meta.org}}/{{meta.name}}/pull/{{prNum}}))'", "Add a line to the changelog" ],
349 [ "git add CHANGELOG.md", "Add the changlelog change to be committed" ], 350 [ "git add CHANGELOG.md", "Add the changlelog change to be committed" ],
350 [ "git commit -a --author='{{prCommits.[0].commit.author.name}} <{{prCommits.[0].commit.author.email}}>' -m '{{line}}. closes #{{prNum}}'", "Commit the changes" ], 351 [ "git commit --amend --no-edit", "Add the changelog change to the merge commit" ],
352 [ "grunt test", "Run tests to make sure they still pass" ],
351 { "prompt": "confirm", "desc": "Does everything look ok?" }, 353 { "prompt": "confirm", "desc": "Does everything look ok?" },
352 [ "git checkout {{pr.base.ref}}", "Check out the base branch" ],
353 [ "git merge --no-ff {{pr.user.login}}-{{pr.head.ref}}", "Merge the changes" ],
354 [ "git push origin {{pr.base.ref}}", "Push the changes to your remote copy of the project" ], 354 [ "git push origin {{pr.base.ref}}", "Push the changes to your remote copy of the project" ],
355 [ "git push upstream {{pr.base.ref}}", "Push the changes to the main project" ], 355 [ "git push upstream {{pr.base.ref}}", "Push the changes to the main project" ],
356 [ "git branch -D {{pr.user.login}}-{{pr.head.ref}}", "Delete the local branch used for merging" ] 356 [ "git branch -D {{pr.user.login}}-{{pr.head.ref}}", "Delete the local branch used for merging" ]
......