> @@ -487,6 +510,52 @@ recreates the topic branch with fresh commits so it can
> be remerged
> successfully without needing to "revert the reversion" (see the
> link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for
> details).
>
> +INCOMPATIBLE OPTIONS
>
On Thu, Jun 21, 2018 at 12:47 PM, Junio C Hamano wrote:
> Elijah Newren writes:
>
>> @@ -280,8 +286,10 @@ other words, the sides are swapped.
>> +
>> Because 'git rebase' replays each commit from the working branch
>> on top of the branch using the given strategy, using
>> -the 'ours'
Elijah Newren writes:
> @@ -280,8 +286,10 @@ other words, the sides are swapped.
> +
> 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 ,
> +the 'ours' strategy
git rebase has many options that only work with one of its three backends.
It also has a few other pairs of incompatible options. Document these.
Signed-off-by: Elijah Newren
---
Documentation/git-rebase.txt | 85
1 file changed, 77 insertions(+), 8
4 matches
Mail list logo
