From: merlyn@stonehenge.com (Randal L. Schwartz)
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: git@vger.kernel.org
Subject: Re: what is "rebase"?
Date: 19 Nov 2005 17:58:14 -0800 [thread overview]
Message-ID: <86psow6pxl.fsf@blue.stonehenge.com> (raw)
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:
C
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!
next prev parent reply other threads:[~2005-11-20 1:58 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-11-19 23:25 what is "rebase"? Randal L. Schwartz
2005-11-20 1:15 ` Johannes Schindelin
2005-11-20 1:58 ` Randal L. Schwartz [this message]
2005-11-20 2:10 ` Randal L. Schwartz
2005-11-20 2:12 ` Andreas Ericsson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=86psow6pxl.fsf@blue.stonehenge.com \
--to=merlyn@stonehenge.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).