2

I forked a project, did changes(C1) and gave pull request which is still in pending. After a week i want to give another pull request with changes(C2).

Meanwhile, upstream (where i forked from) gets lot of changes. So i want to sync my master with upstream, and need to give pull request with changes C2 alone (no need to add changes c1, because i gave separate pull request for this already).

Note: I don't have any branches. I committed C1 in my master and gave pull request. Did changes C2. But this time, i don't where to commit C2 and how to give pull request without adding C1.

user10
  • 5,186
  • 8
  • 43
  • 64
  • Did the detailed steps I have added in [my answer below](http://stackoverflow.com/a/17447104/6309) helped you to make a pull request for `C2` without including `C1`? – VonC Jul 08 '13 at 06:01
  • I haven't tried it yet. But the way you explained make sense. I think you got enormous experience in this area. :) – user10 Jul 08 '13 at 07:14

2 Answers2

4

If you have done C2 in its own branch, all you need to do is:

  • update your master with upstream/master
  • rebase your C2 branch on top of upstream/master
  • make your pull request from C2 branch.

enter image description here

Note that if you rebase C1 branch on top of upstream/master, your existing pull request will automatically be updated!

See also "How to do a Github pull request?".

The OP user10 adds in the comments:

I committed C1 in my master and gave pull request.
I did changes C2, and don't know where to commit and how to give pull request without adding C1.
This is my problem.

So you have:

y--y--y--y  (origin/master)
\
 x--C1--C2  (master)

First, don't do any rebase on top of origin/master, which would trigger an update on your existing pull request (but this time, with C1 and C2 from your rebased master, as I mention in my pull request tips, in the second point)

Make sure C2 is in own branch:

git checkout master
git branch bC2
git reset --hard master C2~
git tag C2base master

If C2 is composed of several successive commits, replace C2~ by the first commit of the C2 series, followed by a '~'.
This assume C2 commits follow C1 commits.

Make sure you don't have any work in progress (not committed): the 'reset --hard' would erase those.

Note that the tag C2base reference the commit just before C2. We will need it below.

y--y--y--y   (origin/master)
\
 x--C1       (master)
    ^ \
    |  --C2  (bC2)
 (C2base)

Then a git pull --rebase origin will replay your master on top origin/master.

y--y--y--y          (origin/master)
\         \
 |         x'--C1'  (master)
 |
 x--C1    
    ^ \
    |  --C2  (bC2)
 (C2base)

Note how C1 gets duplicated here, and is still referenced through the bC2 branch.

Finally, make sure your bC2 branch is done on top of origin/master has well:

git rebase --onto origin/master C2~ bC2
git tag -d baseC2

Which gives you:

           C2'      (bC2)
          /
y--y--y--y          (origin/master)
          \
           x'--C1'  (master)

(The old C1 commit is no longer referenced by anything, so it disappears in the reflog, which can be used to revert improper rebase, for instance)

And you now can do your pull request from the bC2 branch, which contains only C2 commits!

Community
  • 1
  • 1
VonC
  • 1,262,500
  • 529
  • 4,410
  • 5,250
  • I have no branches. I committed C1 in my master and gave pull request. I did changes C2, and don't know where to commit and how to give pull request without adding C1. This is my problem. – user10 Jul 07 '13 at 07:55
  • @user10 Sure. I have edited the answer to include the detailed sequence of commands needed in your case. – VonC Jul 07 '13 at 09:04
  • What tool did you use to generate those graphs? – Chris Heald Jul 07 '13 at 09:05
  • @ChrisHeald err... simple manual ascii art (http://en.wikipedia.org/wiki/ASCII_art) ;) – VonC Jul 07 '13 at 09:09
  • Sorry, no, the graph up top. Or was that just something you already had handy? – Chris Heald Jul 07 '13 at 09:10
  • @ChrisHeald it comes from a blog post from Jimmy Bogard on LostTechies: http://lostechies.com/jimmybogard/2012/04/02/working-with-forks-on-github-or-codeplex/. I don't know what he used, though. – VonC Jul 07 '13 at 09:17
0

before every PR you should be up to date with the master branch. it means that the order of PRs isn't significant for you. finally master branch (and possible new fork) will contain all changes.

speedingdeer
  • 1,236
  • 2
  • 16
  • 26