Hi Philippe
On 25/08/2022 01:29, Philippe Blain wrote:
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
