2010/8/24 Brad King <[email protected]>: > On 08/24/2010 04:12 PM, Eric Noulard wrote: >> 1) git checkout master (local master tracking from git://cmake.org/cmake.git) >> 2) git checkout -b MyBranch >> 3) git pull github MyBranch (gitgub is my github remote: >> [email protected]:TheErk/CMake.git) > > The spurious commit came from the "pull" because your local MyBranch > did not start from the same place the github MyBranch started.
Yes off course it's true. > The pull had to merge instead of just fast forward. You brought everything > on master since you started the topic into the branch. got it. > Replace the first three steps with > > git fetch github > git checkout -b MyBranch github/MyBranch > > to create a local branch that exactly matches the one on github. > >> 4) git checkout next (local next tracking from git://cmake.org/cmake.git) > > Add > > git pull origin next > > here to be sure next is up to date. forgot to tell that but I do that too. In fact I forgot once (but not this time) and the push was rejected because it was not fast-forward. >> 5) git merge MyBranch >> 6) git push > > Good. > > Alternatively, replace steps 4-6 with > > git push stage HEAD This one will create a sibling branch MyBranch in stage right? I didn't know I could push "new" branch in stage. I did only checkout/commit/push once but using existing branch. > ssh [email protected] stage cmake merge -b next MyBranch I used this one already. Thank you for your git-teacher patience. -- Erk Membre de l'April - « promouvoir et défendre le logiciel libre » - http://www.april.org _______________________________________________ cmake-developers mailing list [email protected] http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
