From d1e894c6d7061098ef5e51ff2e4c205adfbaa117 Mon Sep 17 00:00:00 2001 From: Wesley Schwengle Date: Thu, 16 Sep 2021 18:46:03 -0400 Subject: Document `rebase.forkpoint` in rebase man page The configuration option `rebase.forkpoint' is only mentioned in the man page of git-config(1). Since it is a configuration for rebase, mention it in the documentation of rebase at the --fork-point/--no-fork-point section. This will help users set a preferred default for their workflow. Signed-off-by: Wesley Schwengle Signed-off-by: Junio C Hamano --- Documentation/git-rebase.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Documentation') diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 55af6fd24e..2c8558d98c 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -445,7 +445,8 @@ When --fork-point is active, 'fork_point' will be used instead of ends up being empty, the will be used as a fallback. + If 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`. See also +`rebase.forkpoint` in linkgit:git-config[1]. + If your branch was based on but was rewound and your branch contains commits which were dropped, this option can be used -- cgit v1.2.3