Re: [PATCH 4/5] rebase --keep-base: imply --reapply-cherry-picks

From: Phillip Wood <phillip.wood123@gmail.com>
Date: Sep 5, 2022, 13:54 UTC
Message-ID: <84ecdf96-3fdd-ae2a-39a0-f5098a8fa2e5@gmail.com>
In-Reply-To: <53130a55-8bae-0414-64c2-bb577a1ae02d@gmail.com>

Hi Philippe

On 25/08/2022 01:29, Philippe Blain wrote:

Show 16 quoted lines

>> diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
>> index 080658c8710..dc0c6c54e27 100644
>> --- a/Documentation/git-rebase.txt
>> +++ b/Documentation/git-rebase.txt
>> @@ -218,7 +218,7 @@ leave out at most one of A and B, in which case it defaults to HEAD.
>>   	merge base of `<upstream>` and `<branch>`. Running
>>   	`git rebase --keep-base <upstream> <branch>` is equivalent to
>>   	running
>> -	`git rebase --onto <upstream>...<branch> <upstream> <branch>`.
>> +	`git rebase --reapply-cherry-picks --onto <upstream>...<branch> <upstream> <branch>`.
>>   +
>>   This option is useful in the case where one is developing a feature on
>>   top of an upstream branch. While the feature is being worked on, the
> 
> I think the doc should explicitely mention "This implies `--reapply-cherry-picks`",
> in addition to your changes.

That's a good idea, I've already extended the documentation to mention the effect of --keep-base in the discussion of --reapply-cherry-picks, I'll add an extra sentence to the discussion of --keep-base as well.

Thanks

Phillip