Skip to content

brainfood / videojs-contrib-hls

Go to a project
Toggle navigation
Toggle navigation pinning
6fe0e7a1 by David LaPalomento
Options

Rebase PRs against their base branch 

Put the changes on top of their base, instead of the other way around.
1 parent da114864
Inline Side-by-side
Showing 1 changed file with 2 additions and 1 deletions
...@@ -342,7 +342,8 @@ ...@@ -342,7 +342,8 @@
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}} {{pr.head.ref}}", "Merge and rebase the changes"], 345 [ "git pull {{pr.head.repo.ssh_url}}", "Merge the changes"],
346 [ "git rebase {{pr.base.ref}}", "Rebase against the base branch"],
346 [ "git checkout {{pr.base.ref}}", "Check out the base branch" ], 347 [ "git checkout {{pr.base.ref}}", "Check out the base branch" ],
347 { "prompt": "text", "id": "line", "desc": "Describe this change in one line" }, 348 { "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" ], 349 [ "git merge --no-ff {{pr.user.login}}-{{pr.head.ref}} -m '{{line}}. Closes #{{prNum}}'", "Merge the changes" ],
......