From: "Eugine Kosenko" <eugine.kosenko@gmail.com>
To: git@vger.kernel.org
Subject: Re: Repo cleanup problem
Date: Fri, 11 May 2007 12:32:13 +0300 [thread overview]
Message-ID: <9909dee80705110232m5ef56517i542728ef8657971e@mail.gmail.com> (raw)
In-Reply-To: <vpqveezhjb0.fsf@bauges.imag.fr>
2007/5/11, Matthieu Moy <Matthieu.Moy@imag.fr>:
> Branch before the garbage commit. Then, you can use git-rebase to
> replay the correct history on top of your new branch. Note that
> git-rebase will break merging if you already used merge: it does not
> "move" your old commits to your new branch, it instead creates new
> commits with the same changes at the old ones, in the new branch.
>
> That's probably what you've done already.
Almost that. Unfortunately, this simple way causes unexpected
conflicts, so I need also to do sometimes 'git-checkout <tag> .' and
recommit the changes to force the process.
prev parent reply other threads:[~2007-05-11 9:32 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-05-11 8:03 Repo cleanup problem Eugine Kosenko
2007-05-11 8:10 ` Matthieu Moy
2007-05-11 8:19 ` Karl Hasselström
2007-05-11 9:32 ` Eugine Kosenko [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=9909dee80705110232m5ef56517i542728ef8657971e@mail.gmail.com \
--to=eugine.kosenko@gmail.com \
--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 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.