'\" t
.\"     Title: stg-rebase
.\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
.\"      Date: 03/26/2014
.\"    Manual: StGit Manual
.\"    Source: StGit
.\"  Language: English
.\"
.TH "STG\-REBASE" "1" "03/26/2014" "StGit" "StGit Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.\" http://bugs.debian.org/507673
.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.ie \n(.g .ds Aq \(aq
.el       .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.ad l
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
.SH "NAME"
stg-rebase \- Move the stack base to another point in history
.SH "SYNOPSIS"
.sp
.nf
\fIstg\fR rebase [options] [\-\-] <new\-base\-id>
.fi
.SH "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:

.sp
.if n \{\
.RS 4
.\}
.nf
$ git add \-\-update
$ stg refresh
$ stg goto top\-patch
.fi
.if n \{\
.RE
.\}
.sp
Or if you want to skip that patch:

.sp
.if n \{\
.RS 4
.\}
.nf
$ stg undo \-\-hard
$ stg push next\-patch\&.\&.top\-patch
.fi
.if n \{\
.RE
.\}
.SH "OPTIONS"
.PP
\-n, \-\-nopush
.RS 4
Do not push the patches back after rebasing\&.
.RE
.PP
\-m, \-\-merged
.RS 4
Check for patches merged upstream\&.
.RE
.SH "STGIT"
Part of the StGit suite \- see \fBstg\fR(1)