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

StGIT loses Git commit using "stg repair"; I miss "stg assimilate"

From
Jakub Narebski <jnareb@gmail.com>
Date
Jan 7, 2008, 22:45 UTC
Message-ID
<200801072345.21585.jnareb@gmail.com>

I have StGIT branch with no patches applied: all patches are on stack. I have accidentally added git commit on top of StGIT branch head. I tried to use "stg assimilate" to turn this commit into StGIT commit, applied, but new version of StGIT has only "stg repair". And the sequence

 # stg repair
 # stg rebase origin

made me lose this git commit (well, up to reflog of course). This should not happen! Why assimilate got removed?

4206:[gitweb/web@git]# stg --version Stacked GIT 0.14.1 git version 1.5.3.7 Python version 2.4.3 (#1, Jun 13 2006, 16:41:18) [GCC 4.0.2 20051125 (Red Hat 4.0.2-8)]

-- 
Jakub Narebski
Poland
Next: David Kågedal
Message 1 of 3 in “StGIT loses Git commit using "stg repair"; I miss "stg assimilate"”
  1. Jakub NarebskiJan 7, 2008
  2. David KågedalJan 7, 2008
  3. David KågedalJan 7, 2008

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.