Abort Abort the rebase operation and reset HEAD to the original branch.

AllowEmptyMessage No-op.

Apply Use applying strategies to rebase (calling git-am internally).

Autosquash When the commit log message begins with "squash! ..." or "fixup! ..." or "amend! ...", and there is already a commit in the todo list that matches the same ..., automatically modify the todo list of rebase -i, so that the commit marked for squashing comes right after the commit to be modified, and change the action of the moved commit from pick to squash or fixup or fixup -C respectively.

Autostash Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends.

Branch Working branch; defaults to HEAD.

CommitterDateIsAuthorDate Instead of using the current time as the committer date, use the author date of the commit being rebased as the committer date.

Continue Restart the rebasing process after having resolved a merge conflict.

EditTodo Edit the todo list during an interactive rebase.

Empty How to handle commits that are not empty to start and are not clean cherry-picks of any upstream commit, but which become empty after rebasing (because they contain a subset of already upstream changes).

EnsureContext Ensure at least <n> lines of surrounding context match before and after each change.

Exec Append "exec <cmd>" after each line creating a commit in the final history.

ForceRebase Individually replay all rebased commits instead of fast-forwarding over the unchanged ones.

ForkPoint Use reflog to find a better common ancestor between <upstream> and <branch> when calculating which commits have been introduced by <branch>.

GpgSign GPG-sign commits.

IgnoreDate Instead of using the author date of the original commit, use the current time as the author date of the rebased commit.

IgnoreWhitespace Ignore whitespace differences when trying to reconcile differences.

Interactive Make a list of the commits which are about to be rebased.

KeepBase Set the starting point at which to create the new commits to the merge base of <upstream> <branch>.

KeepEmpty Do not keep commits that start empty before the rebase (i.e.

Merge Using merging strategies to rebase (default).

NoAutosquash When the commit log message begins with "squash! ..." or "fixup! ..." or "amend! ...", and there is already a commit in the todo list that matches the same ..., automatically modify the todo list of rebase -i, so that the commit marked for squashing comes right after the commit to be modified, and change the action of the moved commit from pick to squash or fixup or fixup -C respectively.

NoAutostash Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends.

NoFf Individually replay all rebased commits instead of fast-forwarding over the unchanged ones.

NoForkPoint Use reflog to find a better common ancestor between <upstream> and <branch> when calculating which commits have been introduced by <branch>.

NoGpgSign GPG-sign commits.

NoKeepEmpty Do not keep commits that start empty before the rebase (i.e.

NoReapplyCherryPicks Reapply all clean cherry-picks of any upstream commit instead of preemptively dropping them.

NoRerereAutoupdate Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible.

NoRescheduleFailedExec Automatically reschedule exec commands that failed.

NoStat Do not show a diffstat as part of the rebase process.

NoVerify This option bypasses the pre-rebase hook.

Onto Starting point at which to create the new commits.

PreserveMerges --preserve-merges was replaced by --rebase-merges.

Quiet Be quiet.

Quit Abort the rebase operation but HEAD is not reset back to the original branch.

ReapplyCherryPicks Reapply all clean cherry-picks of any upstream commit instead of preemptively dropping them.

RebaseMerges By default, a rebase will simply drop merge commits from the todo list, and put the rebased commits into a single, linear branch.

RerereAutoupdate Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible.

RescheduleFailedExec Automatically reschedule exec commands that failed.

ResetAuthorDate Instead of using the author date of the original commit, use the current time as the author date of the rebased commit.

Root Rebase all commits reachable from <branch>, instead of limiting them with an <upstream>.

ShowCurrentPatch Show the current patch in an interactive rebase or when rebase is stopped because of conflicts.

Signoff Add a Signed-off-by trailer to all the rebased commits.

Skip Restart the rebasing process by skipping the current patch.

Stat Show a diffstat of what changed upstream since the last rebase.

Strategy Use the given merge strategy, instead of the default ort.

StrategyOption Pass the <strategy-option> through to the merge strategy.

Upstream branch to compare against.

Verbose Be verbose.

Verify Allows the pre-rebase hook to run, which is the default.

Whitespace This flag is passed to the git apply program (see git-apply(1)) that applies the patch.