From: Andreas Ericsson <ae@op5.se>
To: "Randal L. Schwartz" <merlyn@stonehenge.com>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>, git@vger.kernel.org
Subject: Re: what is "rebase"?
Date: Sun, 20 Nov 2005 03:12:27 +0100 [thread overview]
Message-ID: <437FDB8B.8030707@op5.se> (raw)
In-Reply-To: <86psow6pxl.fsf@blue.stonehenge.com>
Randal L. Schwartz wrote:
> Is this what I would use if I want to discard history except for
> major milestones?
>
No.
> Still not sure what "cherry-pick" is either. And that's *not*
> in the glossary. :)
>
man git-cherry-pick
> 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.
>
If you do experimental development on a branch and want to throw stuff
away (commits, tags, whatnot), you should run "git-reset". It can bring
any combination of index and working tree back to any commit in the
history of that branch.
--
Andreas Ericsson andreas.ericsson@op5.se
OP5 AB www.op5.se
Tel: +46 8-230225 Fax: +46 8-230231
prev parent reply other threads:[~2005-11-20 2:12 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
2005-11-20 2:10 ` Randal L. Schwartz
2005-11-20 2:12 ` Andreas Ericsson [this message]
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=437FDB8B.8030707@op5.se \
--to=ae@op5.se \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=merlyn@stonehenge.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.