[PATCH] Document `rebase.forkpoint` in rebase man page
- From
- wesley@schwengle.net <wesley@schwengle.net>
- Date
- Sep 16, 2021, 22:35 UTC
- Message-ID
- <20210916223528.2910292-2-wesley@schwengle.net>
- In-Reply-To
- <20210916223528.2910292-1-wesley@schwengle.net>
From: Wesley Schwengle <wesley@opperschaap.net>
The option exists and the rebase behaviour tricked me into thinking there was a bug with git. This will tell people how they can tweak the default behavior.
Signed-off-by: Wesley Schwengle <wesley@opperschaap.net> --- Documentation/git-rebase.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 506345cb0e..8d2bee3365 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -446,7 +446,8 @@ When --fork-point is active, 'fork_point' will be used instead of ends up being empty, the <upstream> will be used as a fallback. + If <upstream> is given on the command line, then the default is -`--no-fork-point`, otherwise the default is `--fork-point`. +`--no-fork-point`, otherwise the default is `--fork-point`. You can override +this default by setting the configuration option `rebase.forkpoint` to false. + 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.33.0.364.gff7047fb76