Not implemented Restore the original branch and abort the rebase operation.

Not implemented These flags are passed to 'git-am' to easily change the dates of the rebased commits (see linkgit:git-am[1]).

Not implemented Ensure at least n lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored.

Not implemented Restart the rebasing process after having resolved a merge conflict.

Not implemented Force the rebase even if the current branch is a descendant of the commit you are rebasing onto. Normally the command will exit with the message "Current branch is up to date" in such a situation.

Not implemented These flags are passed to 'git-am' to easily change the dates of the rebased commits (see linkgit:git-am[1]).

Not implemented These flag are passed to the 'git-apply' program (see linkgit:git-apply[1]) that applies the patch. Incompatible with the --interactive option.

Not implemented Make a list of the commits which are about to be rebased. Let the user edit that list before rebasing. This mode can also be used to split commits (see SPLITTING COMMITS below).

Not implemented Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side. + Note that a rebase merge works by replaying each commit from the working branch on top of the branch. Because of this, when a merge conflict happens, the side reported as 'ours' is the so-far rebased series, starting with , and 'theirs' is the working branch. In other words, the sides are swapped.

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

Not implemented This option bypasses the pre-rebase hook. See also linkgit:githooks[5].

Not implemented Instead of ignoring merges, try to recreate them.

Not implemented Be quiet. Implies --no-stat.

Not implemented Rebase all commits reachable from , instead of limiting them with an . This allows you to rebase the root commit(s) on a branch. Must be used with --onto, and will skip changes already contained in (instead of ). When used together with --preserve-merges, 'all' root commits will be rewritten to have as parent instead.

Not implemented Restart the rebasing process by skipping the current patch.

Not implemented Show a diffstat of what changed upstream since the last rebase. The diffstat is also controlled by the configuration option rebase.stat.

Not implemented Use the given merge strategy. If there is no `-s` option 'git-merge-recursive' is used instead. This implies --merge. + Because 'git-rebase' replays each commit from the working branch on top of the branch using the given strategy, using the 'ours' strategy simply discards all patches from the , which makes little sense.

Not implemented Be verbose. Implies --stat.

Not implemented These flag are passed to the 'git-apply' program (see linkgit:git-apply[1]) that applies the patch. Incompatible with the --interactive option.