On Fri, 5 Oct 2012, Renk Thorsten wrote: > GIT specialists - please help: I actually did not want to mix all of > these topics together, so these are sorted into three different commits, > but I just discovered I can just create a merge request for a range of > commits, but not pick one. How should I do this - or is a combined merge > request with three commits okay? > > The way I've been operating is > > * take a clean copy of a rebased master into a new branch > * edit in all the changes I want to have in the merge request, copy in all > new files > * do a merge request from there rather than from my actual devel branch > > But this doesn't seem to do what I intend (?)
What you want to do is create one clean copy of master of each of your merge requests: git branch my-merge-request-42 origin/master Switch to that branch: git checkout my-merge-request-42 Then cherry-pick the changes you want to have inside this merge request (use git log your-local-development-branch to find the commit ids): git cherry-pick <commit 1> git cherry-pick <commit 2> ... Finally, push your new merge request branch to your gitorious clone and then file the merge request in the gitorious UI: git push my-gitorious my-merge-request-42 You can delete a branch you no longer want in your gitorious repository with (IIRC, you might need -f): git push my-gitorious :branch-to-remove Cheers, Anders -- --------------------------------------------------------------------------- Anders Gidenstam WWW: http://gitorious.org/anders-hangar http://www.gidenstam.org/FlightGear/ ------------------------------------------------------------------------------ Don't let slow site performance ruin your business. Deploy New Relic APM Deploy New Relic app performance management and know exactly what is happening inside your Ruby, Python, PHP, Java, and .NET app Try New Relic at no cost today and get our sweet Data Nerd shirt too! http://p.sf.net/sfu/newrelic-dev2dev _______________________________________________ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
