Re: AnalyzeSkeleton update

Posted by dscho on Aug 06, 2009; 2:53pm
URL: http://imagej.273.s1.nabble.com/AnalyzeSkeleton-update-tp3691537p3691542.html

Hi,

On Thu, 6 Aug 2009, Michael Doube wrote:

> I'd like to track the changes to the Fiji version of AnalyzeSkeleton_
> and merge some bits with my BoneJ version, Analyze_Skeleton, which is
> hosted on github (and of course in my local git repo).  What's a good
> way to do that, better than what I'm doing now which is just reading
> Ignacio's code and copy-pasting the bits I want?

Mini Git tutorial (as most of the list members are most likely pretty
disinterested in the issue):

Start tracking fiji.git in so-called "remote branches", i.e. locally
cached copies of branches on the remote repository:

$ git remote add -f fiji git://pacific.mpi-cbg.de/fiji.git

Have a look at the changes affecting Analyze_Skeleton:

$ gitk fiji/master -- src-plugins/AnalyzeSkeleton_/

Note the commit names (the 40-character strings identifying each commit
uniquely) of the changes you do not have yet.  Then pick those changes
into your current branch, one by one:

$ git cherry-pick <commit-name>

If you want to have interactive help: I'll be in #fiji-devel (that's an
IRC channel on freenode.net) next week (this week I am on holiday).

Ciao,
Dscho