Signed-off-by: Wesley Schwengle <wesleys@xxxxxxxxxxxxxxx> --- Documentation/git-rebase.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index e7b39ad244..e47b58bec2 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -462,7 +462,9 @@ ends up being empty, the `<upstream>` will be used as a fallback. + If `<upstream>` or `--keep-base` is given on the command line, then the default is `--no-fork-point`, otherwise the default is -`--fork-point`. See also `rebase.forkpoint` in linkgit:git-config[1]. +`--fork-point`. See also `rebase.forkpoint` in linkgit:git-config[1]. This +behaviour will be changed in an upcoming release of git. It is advised that you +set `rebase.forkpoint` in your config or supply the command line switches. + If your branch was based on `<upstream>` but `<upstream>` was rewound and your branch contains commits which were dropped, this option can be used -- 2.42.0.103.g5622fd1409.dirty
