Re: what is "rebase"?

From: Randal L. Schwartz <merlyn@stonehenge.com>
Date: Nov 20, 2005, 01:58 UTC
Message-ID: <86psow6pxl.fsf@blue.stonehenge.com>
In-Reply-To: <Pine.LNX.4.63.0511200214280.11653@wbgn013.biozentrum.uni-wuerzburg.de>

>>>>> "Johannes" == Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

Johannes> How about the definition in Documentation/glossary.txt?

>> rebase::
>> To clean a branch by starting from the head of the main line of
>> development ("master"), and reapply the (possibly cherry-picked)
>> changes from that branch.

Well, I got what I wanted... someone pointing me to a simple explanation. However, I'm still lost. When would I do this, and what will the effect be?

Is this what I would use if I want to discard history except for major milestones? Like if I had:

        A - edit - edit - edit - B - edit - edit - edit - C

and I wanted to really just retain:

        A - B - C

Or is this just to make it look like:

Still not sure what "cherry-pick" is either. And that's *not* in the glossary. :)

I'm just worried about my archive getting bigger and bigger and having lots of junk in it that I can't get rid of.

-- 
Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095
<merlyn@stonehenge.com> <URL:http://www.stonehenge.com/merlyn/>
Perl/Unix/security consulting, Technical writing, Comedy, etc. etc.
See PerlTraining.Stonehenge.com for onsite and open-enrollment Perl training!