git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Recording merges after repo conversion

From
LHLars Hjemli <hjemli@gmail.com>
Date
Oct 30, 2007, 21:46 UTC
Message-ID
<8c5c35580710301446y119f8199u8dce4b500316376a@mail.gmail.com>
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:
Show 5 quoted lines
> Lars Hjemli:
>
> > No, the grafts file is purely local.
>
> Hmm, any chance that will change in a future version?
Not likely
Show 5 quoted lines
>
> > 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
Previous: Peter KarlssonNext: Johannes Schindelin
Message 6 of 21 in “Recording merges after repo conversion”
  1. Peter KarlssonOct 9, 2007
  2. Benoit SIGOUREOct 9, 2007
  3. Peter KarlssonOct 30, 2007
  4. Lars HjemliOct 30, 2007
  5. Peter KarlssonOct 30, 2007
  6. Lars HjemliOct 30, 2007
  7. Johannes SchindelinOct 31, 2007
  8. Peter KarlssonOct 31, 2007
  9. Johannes SchindelinOct 31, 2007
  10. Peter KarlssonOct 31, 2007
  11. Johannes SchindelinOct 31, 2007
  12. Johan HerlandOct 31, 2007
  13. Johannes SchindelinOct 31, 2007
  14. Johan HerlandOct 31, 2007
  15. Johannes SchindelinOct 31, 2007
  16. Johan HerlandOct 31, 2007
  17. Johannes SchindelinOct 31, 2007
  18. Linus TorvaldsOct 31, 2007
  19. Johan HerlandOct 31, 2007
  20. Johannes SchindelinOct 30, 2007
  21. Peter KarlssonOct 31, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.