Rechercher une page de manuel
stg-rebase
Langue: en
Version: 11/24/2009 (ubuntu - 24/10/10)
Section: 1 (Commandes utilisateur)
Sommaire
NAME
stg-rebase - Move the stack base to another point in historySYNOPSIS
stg rebase [options] <new-base-id>
DESCRIPTION
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
-n, --nopush
- Do not push the patches back after rebasing.
-m, --merged
- Check for patches merged upstream.
STGIT
Part of the StGit suite - see linkman:stg[1]Contenus ©2006-2024 Benjamin Poulain
Design ©2006-2024 Maxime Vantorre