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

making stgit handle being rebased by git rebase

From
Chris Packham <judge.packham@gmail.com>
Date
Nov 8, 2010, 22:39 UTC
Message-ID
<AANLkTik3MVNW0svJEo5gWq3+qGo6dKeqAUz9NPcJnYNN@mail.gmail.com>
Hi Catalin, Karl,
Has anyone looked at making stgit interact with git-rebase more gracefully?

I've been playing with some of the recent git submodule improvements, in particular the submodule.<mod>.update=rebase option. When I have a submodule which I've been using stgit on it gets a bit upset when the branch gets rebased by git. I don't loose any work but all my stgit patches get turned into git commits. I can get them back with stg repair and/or stg uncommit but I was wondering if there was any way of making stgit play nicely with git rebase.

As a workaround I could have something remember the applied patches, run stg pop -a and re-apply the patches after the fact. All of which is doable but maybe there is a better way.

Thanks, Chris

Next: Karl Wiberg
Message 1 of 4 in “making stgit handle being rebased by git rebase”
  1. Chris PackhamNov 8, 2010
  2. Karl WibergNov 11, 2010
  3. Catalin MarinasNov 11, 2010
  4. Karl WibergNov 11, 2010

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.