stg-rebase(1) — Linux manual page

NAME \| SYNOPSIS \| DESCRIPTION \| OPTIONS \| STGIT \| COLOPHON

STG-REBASE(1)                 StGit Manual                 STG-REBASE(1)

NAME top

       stg-rebase - Move the stack base to another point in history

SYNOPSIS top

       stg rebase [options] [--] [new-base-id]

DESCRIPTION top

       Pop all patches from current stack, move the stack base to the
       given [new-base-id] and push the patches back.

       If you experience merge conflicts, resolve the problem and
       continue the rebase by executing the following sequence:

           $ git add --update
           $ stg refresh
           $ stg goto top-patch

       Or if you want to skip that patch:

           $ stg undo --hard
           $ stg push next-patch..top-patch

OPTIONS top

       -i, --interactive
           Open an interactive editor to manipulate patches.

       -n, --nopush
           Do not push the patches back after rebasing.

       -m, --merged
           Check for patches merged upstream.

       --autostash
           Automatically create a temporary stash before the operation
           begins, and apply it after the operation ends. This means
           that you can run rebase on a dirty work-tree. However, use
           with care: the final stash application after a successful
           rebase might result in non-trivial conflicts.

STGIT top

       Part of the StGit suite - see stg(1)

COLOPHON top

       This page is part of the stgit (Stacked Git) project.
       Information about the project can be found at 
       ⟨http://www.procode.org/stgit/⟩.  If you have a bug report for
       this manual page, see ⟨http://www.procode.org/stgit/⟩.  This page
       was obtained from the project's upstream Git repository
       ⟨http://repo.or.cz/stgit.git⟩ on 2022-12-17.  (At that time, the
       date of the most recent commit that was found in the repository
       was 2022-01-07.)  If you discover any rendering problems in this
       HTML version of the page, or you believe there is a better or
       more up-to-date source for the page, or you have corrections or
       improvements to the information in this COLOPHON (which is not
       part of the original manual page), send a mail to
       man-pages@man7.org

StGit 1.4.dev34+g8254ffb       12/17/2022                  STG-REBASE(1)

Pages that refer to this page: stg(1)