[geos-devel] Weekly Report 5 - Adding Voronoi Diagram to GEOS

[Sandro Santilli]

On Wed, Jul 24, 2013 at 12:13:01PM +0530, vishal tiwari wrote:
> Hey,
> 
> i have made separate branches, where i have made a subsets
> of functionality, but when i send a pull request, i see that all the
> previous commits are also there. And it says 23 commits awaited to
> be merged, but i only want the last commit for that branch. How do i remove
> the previous commits, that i made before?

One thing you could do is cherry-pick the commit you're interested in
from another branch which tracks the origin master.

Example:

  # save all changes into a separate branch, check it out
  master$ git branch allchanges

  # reset local "master" branch to be the same as the origin one
  master$ git reset --hard origin/master

  # create another branch for the triange improvements
  master$ git checkout -b triangle

  # cherry-pick the last commit in "allchanges"
  triangle$ git cherry-pick allchanges

  # push your proposed update online
  # (assumes your fork remote is called "myfork")
  triangle$ git push -u myfork triangle

Please make sure to backup your changes before, just in case... :)

--strk;