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

[PATCH 0/5] stgit rebasing fixes

From
Yann Dirson <ydirson@altern.org>
Date
Feb 20, 2007, 00:13 UTC
Message-ID
<20070220000908.31139.36841.stgit@gandelf.nowhere.earth>

The following series stores a backup of the stack-base to detect when it is safe to rebase or not (by "stg rebase" or "stg pull" in fetch+rebase mode).

The final patch in the series is the one implementing this, but is not tested enough for 0.12.1.

The previous ones, however, may be good to have in 0.12.1. Especially the patch that adds tracking of the orig-base parameter, since that will make things safer for more people when the final patch gets shipped (if no orig-base is found, rebasing is currently done without checking, to stay backwards-compatible).

-- 
Yann Dirson    <ydirson@altern.org> |
Debian-related: <dirson@debian.org> |   Support Debian GNU/Linux:
                                    |  Freedom, Power, Stability, Gratis
     http://ydirson.free.fr/        | Check <http://www.debian.org/>
Next: Yann Dirson
Message 1 of 7 in “stgit rebasing fixes”
  1. 0/5 stgit rebasing fixesYann Dirson, Feb 20, 2007
  2. 1/5 Factorize rebasing behaviour.Yann Dirson, Feb 20, 2007
  3. 2/5 Move stack-base querying into Series class.Yann Dirson, Feb 20, 2007
  4. 3/5 Various cleanups for clarity.Yann Dirson, Feb 20, 2007
  5. 4/5 Keep track of safe base changes.Yann Dirson, Feb 20, 2007
  6. 5/5 Refuse to pull/rebase when rendered unsafe by (un)commits.Yann Dirson, Feb 20, 2007
  7. stgit "push --merged" woesYann Dirson, Feb 28, 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.