Presenting a subset of commits on a branch as a github pull request

Question

I forked a project on github.

I made commit 1,2,3,4 & 5 on my master branch.

I want to present commit 2 & 5 as a pull request to upstream, in such a way that when upstream accepts, and I sync my branch with upstream, I don't get any conflicts.

What are the various ways I could do that?

score 5 · Accepted Answer · edited May 23 '17 at 11:47

5

You could:

fetch the upstream branch
rebase --interactive your branch on top of it, making sure commit 2 & 5 are re-ordered as commit 1 & 2
submit those 2 commits as pull requests to the fork queue of upstream project.

edited May 23 '17 at 11:47

Community

1
1

answered Oct 05 '10 at 20:11

VonC

1,262,500
529
4,410
5,250

on the theory of `rebase --interactive`, see also http://stackoverflow.com/questions/3022409/cherrypicking-versus-rebasing/3022452#3022452 – VonC Oct 05 '10 at 20:15

Presenting a subset of commits on a branch as a github pull request

1 Answers1

Linked