Show 44 quoted lines
> Changes in V6:
> - Update the commit message per the review comments, making it clearer.
>
> Documentation/git-rebase.adoc | 8 ++------
> 1 file changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/Documentation/git-rebase.adoc b/Documentation/git-rebase.adoc
> index f6c22d1598..f1f675d311 100644
> --- a/Documentation/git-rebase.adoc
> +++ b/Documentation/git-rebase.adoc
> @@ -217,6 +217,8 @@ OPTIONS
> As a special case, you may use "A\...B" as a shortcut for the
> merge base of A and B if there is exactly one merge base. You can
> leave out at most one of A and B, in which case it defaults to HEAD.
> ++
> +See also INCOMPATIBLE OPTIONS below.
>
> See TRANSPLANTING A TOPIC BRANCH WITH --ONTO above for examples.
>
> @@ -332,8 +334,6 @@ See also INCOMPATIBLE OPTIONS below.
> and this option would override that behavior, allowing commits
> with empty messages to be rebased. Now commits with an empty
> message do not cause rebasing to halt.
> -+
> -See also INCOMPATIBLE OPTIONS below.
>
> -m::
> --merge::
> @@ -487,15 +487,11 @@ applying (in terms of the author date).
> Instead of using the author date of the original commit, use
> the current time as the author date of the rebased commit. This
> option implies `--force-rebase`.
> -+
> -See also INCOMPATIBLE OPTIONS below.
>
> --signoff::
> Add a `Signed-off-by` trailer to all the rebased commits. Note
> that if `--interactive` is given then only commits marked to be
> picked, edited or reworded will have the trailer added.
> -+
> -See also INCOMPATIBLE OPTIONS below.
>
> --trailer=<trailer>::
> Append the given trailer to every rebased commit message, processed