Re: [git-users] Adding a pull request (newer master) to my build

2017-08-12 Thread Michael
, however, leave me in detached head state after success. > > - Original Message - From: "Michael" <keybou...@gmail.com> > To: <git-users@googlegroups.com> > Sent: Thursday, August 10, 2017 3:55 PM > Subject: Re: [git-users] Adding a pull request (n

Re: [git-users] Adding a pull request (newer master) to my build

2017-08-12 Thread Philip Oakley
they have what you expect. Philip - Original Message - From: "Michael" <keybou...@gmail.com> To: <git-users@googlegroups.com> Sent: Wednesday, August 09, 2017 12:53 AM Subject: Re: [git-users] Adding a pull request (newer master) to my build Thank you! And yes, eve

Re: [git-users] Adding a pull request (newer master) to my build

2017-08-10 Thread Michael
e .git directory, so you you > can see if they have what you expect. > > Philip > > - Original Message - From: "Michael" <keybou...@gmail.com> > To: <git-users@googlegroups.com> > Sent: Wednesday, August 09, 2017 12:53 AM > Subject: Re: [git-

Re: [git-users] Adding a pull request (newer master) to my build

2017-08-09 Thread Philip Oakley
. Philip - Original Message - From: "Michael" <keybou...@gmail.com> To: <git-users@googlegroups.com> Sent: Wednesday, August 09, 2017 12:53 AM Subject: Re: [git-users] Adding a pull request (newer master) to my build Thank you! And yes, everything in this case ha

Re: [git-users] Adding a pull request (newer master) to my build

2017-08-08 Thread Michael
Thank you! And yes, everything in this case has a common root at tag 18.0.2. So, if I'm understanding this correctly, what I want is git checkout LocalMaster git checkout -b Pull979 git rebase --onto head origin/master origin/pr/979 ... Does that make sense to you? keybounceMBP:obs-studio

Re: [git-users] Adding a pull request (newer master) to my build

2017-08-08 Thread Michael
Thank you! And yes, everything in this case has a common root at tag 18.0.2. So, if I'm understanding this correctly, what I want is git checkout LocalMaster git checkout -b Pull979 git rebase --onto head origin/master origin/pr/979 ... Does that make sense to you? keybounceMBP:obs-studio

Re: [git-users] Adding a pull request (newer master) to my build

2017-08-08 Thread Philip Oakley
Hi Michael, I almost always end up using the three parameter version of rebase! for that version you provide the start point and the end point (of the original series to be rebased) and a --onto reference. That way I can be certain that I got just the right parts being transcribed as a patch

Re: [git-users] Adding a pull request (newer master) to my build

2017-08-08 Thread Michael
On 2017-08-08, at 1:27 PM, Philip Oakley wrote: > Hi Michael, > > sounds like you need (one way of viewing the steps required) to rebase the > old series "take the total deltas " and apply that to a new branch taken from > 'current branch (LocalMaster)'. This (rebase)

Re: [git-users] Adding a pull request (newer master) to my build

2017-08-08 Thread Philip Oakley
Hi Michael, sounds like you need (one way of viewing the steps required) to rebase the old series "take the total deltas " and apply that to a new branch taken from 'current branch (LocalMaster)'. This (rebase) will give you a clean copy of the series as patches (it is what rebase does