1STG-REBASE(1)                    StGit Manual                    STG-REBASE(1)
2
3
4

NAME

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

SYNOPSIS

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

DESCRIPTION

12       Pop all patches from current stack, move the stack base to the given
13       [new-base-id] and push the patches back.
14
15       If you experience merge conflicts, resolve the problem and continue the
16       rebase by executing the following sequence:
17
18           $ git add --update
19           $ stg refresh
20           $ stg goto top-patch
21
22       Or if you want to skip that patch:
23
24           $ stg undo --hard
25           $ stg push next-patch..top-patch
26

OPTIONS

28       -i, --interactive
29           Open an interactive editor to manipulate patches.
30
31       -n, --nopush
32           Do not push the patches back after rebasing.
33
34       -m, --merged
35           Check for patches merged upstream.
36
37       --autostash
38           Automatically create a temporary stash before the operation begins,
39           and apply it after the operation ends. This means that you can run
40           rebase on a dirty work-tree. However, use with care: the final
41           stash application after a successful rebase might result in
42           non-trivial conflicts.
43

STGIT

45       Part of the StGit suite - see stg(1)
46
47
48
49StGit 1.4                         01/22/2022                     STG-REBASE(1)