[<upstream> [<branch>]]
'git rebase' [-i | --interactive] [options] [--exec <cmd>] [--onto <newbase>]
--root [<branch>]
-'git rebase' --continue | --skip | --abort | --quit | --edit-todo
+'git rebase' --continue | --skip | --abort | --quit | --edit-todo | --show-current-patch
DESCRIPTION
-----------
Keep the commits that do not change anything from its
parents in the result.
+--allow-empty-message::
+ By default, rebasing commits with an empty message will fail.
+ This option overrides that behavior, allowing commits with empty
+ messages to be rebased.
+
--skip::
Restart the rebasing process by skipping the current patch.
--edit-todo::
Edit the todo list during an interactive rebase.
+--show-current-patch::
+ Show the current patch in an interactive rebase or when rebase
+ is stopped because of conflicts. This is the equivalent of
+ `git show REBASE_HEAD`.
+
-m::
--merge::
Use merging strategies to rebase. When the recursive (default) merge
rebase.instructionFormat. A customized instruction format will automatically
have the long commit hash prepended to the format.
---recreate-merges::
- Recreate merge commits instead of flattening the history by replaying
- merges. Merge conflict resolutions or manual amendments to merge
- commits are not recreated automatically, but have to be recreated
- manually.
-
-p::
--preserve-merges::
Recreate merge commits instead of flattening the history by replaying
The todo list presented by `--preserve-merges --interactive` does not
represent the topology of the revision graph. Editing commits and
rewording their commit messages should work fine, but attempts to
-reorder commits tend to produce counterintuitive results. Use
---recreate-merges for a more faithful representation.
+reorder commits tend to produce counterintuitive results.
For example, an attempt to rearrange
------------