From: "Lars Hjemli" <hjemli@gmail.com>
To: "Peter Karlsson" <peter@softwolves.pp.se>
Cc: "Benoit SIGOURE" <tsuna@lrde.epita.fr>, git@vger.kernel.org
Subject: Re: Recording merges after repo conversion
Date: Tue, 30 Oct 2007 22:46:00 +0100 [thread overview]
Message-ID: <8c5c35580710301446y119f8199u8dce4b500316376a@mail.gmail.com> (raw)
In-Reply-To: <Pine.LNX.4.62.0710302204590.6976@perkele.intern.softwolves.pp.se>
On Oct 30, 2007 10:06 PM, Peter Karlsson <peter@softwolves.pp.se> wrote:
> Lars Hjemli:
>
> > No, the grafts file is purely local.
>
> Hmm, any chance that will change in a future version?
Not likely
>
> > To achieve your goal, you'd have to 'git filter-branch' before
> > pushing/cloning. But beware: this _will_ rewrite your current branch(es).
>
> Ouch. I'll have to think about whether I want to do that, then...
Well, it isn't dangerous, but if someone has already cloned your repo
_and_ commited local changes they'll need to rebase their work onto
the new branch(es). Basically, you'll want to inform these people that
you're going to rewrite the branches.
--
larsh
next prev parent reply other threads:[~2007-10-30 21:46 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-09 7:09 Recording merges after repo conversion Peter Karlsson
2007-10-09 7:19 ` Benoit SIGOURE
2007-10-30 13:34 ` Peter Karlsson
2007-10-30 14:29 ` Lars Hjemli
2007-10-30 21:06 ` Peter Karlsson
2007-10-30 21:46 ` Lars Hjemli [this message]
2007-10-31 2:28 ` Johannes Schindelin
2007-10-31 9:50 ` Peter Karlsson
2007-10-31 11:01 ` Johannes Schindelin
2007-10-31 12:07 ` Peter Karlsson
2007-10-31 12:32 ` Johannes Schindelin
2007-10-31 12:43 ` Johan Herland
2007-10-31 13:43 ` Johannes Schindelin
2007-10-31 14:37 ` Johan Herland
2007-10-31 15:03 ` Johannes Schindelin
2007-10-31 15:21 ` Johan Herland
2007-10-31 15:57 ` Johannes Schindelin
2007-10-31 16:43 ` Linus Torvalds
2007-10-31 17:08 ` Johan Herland
2007-10-30 15:05 ` Johannes Schindelin
2007-10-31 12:17 ` Peter Karlsson
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=8c5c35580710301446y119f8199u8dce4b500316376a@mail.gmail.com \
--to=hjemli@gmail.com \
--cc=git@vger.kernel.org \
--cc=peter@softwolves.pp.se \
--cc=tsuna@lrde.epita.fr \
/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).