[git-users] Merging workflow

2010-08-12 Thread David Doria
Hi all, I have a branch called daviddoria. From this branch, I created multiple branches (Project1, Project2, and Project3). I want to have a branch where I can use everything from all three project branches. My question is - if I merge Project1 into daviddoria, won't this also affect Project2

Re: [git-users] Merging workflow

2010-08-12 Thread Daniel Trezub
Hi, David I have this very same question (but I think you expressed it way better) I am trying to figure it out. If I can discover the answer, I´ll post here. Thanks. = Daniel Trezub http://www.gameblogs.com.br On 12 August 2010 11:22, David Doria daviddo...@gmail.com wrote: Hi all, I

Re: [git-users] Merging workflow

2010-08-12 Thread Donovan Bray
Create a new branch all (or some other more descriptive name) based on daviddoria, then merge the other projects into it. You have your combined branch, and all of the source branches won't be polluted by each others commits. On Aug 12, 2010, at 7:22 AM, David Doria daviddo...@gmail.com

[git-users] Re: How to move the master?

2010-08-12 Thread jd
On Aug 12, 3:18 am, Konstantin Khomoutov khomou...@gmail.com wrote: That's because you created a situation known as detached HEAD. How can I fix this?  I want master to point to the same place as HEAD. Record the name of the commit HEAD points at, checkout master and hard reset it to that

[git-users] Re: Merging workflow

2010-08-12 Thread David Doria
Wow.. it was that easy. Then when I update something in Project1, I just do a |[dor...@localhost AllProjects]$ git pull origin Project1 and AllProjects is now up to date. Is there any standard way to make a script to pull from a whole bunch of projects? Or should I just make a bash script with