2021-06-20 12:41:05 +00:00
|
|
|
.\" DO NOT MODIFY THIS FILE! It was generated by help2man.
|
2022-07-10 09:15:19 +00:00
|
|
|
.TH REPO "1" "July 2022" "repo rebase" "Repo Manual"
|
2021-06-20 12:41:05 +00:00
|
|
|
.SH NAME
|
|
|
|
|
repo \- repo rebase - manual page for repo rebase
|
|
|
|
|
.SH SYNOPSIS
|
|
|
|
|
.B repo
|
|
|
|
|
\fI\,rebase {\/\fR[\fI\,<project>\/\fR...] \fI\,| -i <project>\/\fR...\fI\,}\/\fR
|
|
|
|
|
.SH DESCRIPTION
|
|
|
|
|
Summary
|
|
|
|
|
.PP
|
|
|
|
|
Rebase local branches on upstream branch
|
|
|
|
|
.SH OPTIONS
|
|
|
|
|
.TP
|
|
|
|
|
\fB\-h\fR, \fB\-\-help\fR
|
|
|
|
|
show this help message and exit
|
|
|
|
|
.TP
|
|
|
|
|
\fB\-\-fail\-fast\fR
|
|
|
|
|
stop rebasing after first error is hit
|
|
|
|
|
.TP
|
|
|
|
|
\fB\-f\fR, \fB\-\-force\-rebase\fR
|
|
|
|
|
pass \fB\-\-force\-rebase\fR to git rebase
|
|
|
|
|
.TP
|
|
|
|
|
\fB\-\-no\-ff\fR
|
|
|
|
|
pass \fB\-\-no\-ff\fR to git rebase
|
|
|
|
|
.TP
|
|
|
|
|
\fB\-\-autosquash\fR
|
|
|
|
|
pass \fB\-\-autosquash\fR to git rebase
|
|
|
|
|
.TP
|
|
|
|
|
\fB\-\-whitespace\fR=\fI\,WS\/\fR
|
|
|
|
|
pass \fB\-\-whitespace\fR to git rebase
|
|
|
|
|
.TP
|
|
|
|
|
\fB\-\-auto\-stash\fR
|
|
|
|
|
stash local modifications before starting
|
|
|
|
|
.TP
|
|
|
|
|
\fB\-m\fR, \fB\-\-onto\-manifest\fR
|
|
|
|
|
rebase onto the manifest version instead of upstream
|
|
|
|
|
HEAD (this helps to make sure the local tree stays
|
|
|
|
|
consistent if you previously synced to a manifest)
|
|
|
|
|
.SS Logging options:
|
|
|
|
|
.TP
|
|
|
|
|
\fB\-v\fR, \fB\-\-verbose\fR
|
|
|
|
|
show all output
|
|
|
|
|
.TP
|
|
|
|
|
\fB\-q\fR, \fB\-\-quiet\fR
|
|
|
|
|
only show errors
|
|
|
|
|
.TP
|
|
|
|
|
\fB\-i\fR, \fB\-\-interactive\fR
|
|
|
|
|
interactive rebase (single project only)
|
2022-07-10 09:15:19 +00:00
|
|
|
.SS Multi\-manifest options:
|
|
|
|
|
.TP
|
|
|
|
|
\fB\-\-outer\-manifest\fR
|
|
|
|
|
operate starting at the outermost manifest
|
|
|
|
|
.TP
|
|
|
|
|
\fB\-\-no\-outer\-manifest\fR
|
|
|
|
|
do not operate on outer manifests
|
|
|
|
|
.TP
|
|
|
|
|
\fB\-\-this\-manifest\-only\fR
|
|
|
|
|
only operate on this (sub)manifest
|
|
|
|
|
.TP
|
|
|
|
|
\fB\-\-no\-this\-manifest\-only\fR, \fB\-\-all\-manifests\fR
|
|
|
|
|
operate on this manifest and its submanifests
|
2021-06-20 12:41:05 +00:00
|
|
|
.PP
|
|
|
|
|
Run `repo help rebase` to view the detailed manual.
|
|
|
|
|
.SH DETAILS
|
|
|
|
|
.PP
|
|
|
|
|
\&'repo rebase' uses git rebase to move local changes in the current topic branch
|
|
|
|
|
to the HEAD of the upstream history, useful when you have made commits in a
|
|
|
|
|
topic branch but need to incorporate new upstream changes "underneath" them.
|
