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 <wesley@opperschaap.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Wesley Schwengle committed
Sep 16, 2021 at 18:46 UTC
d1e894c6d7061098ef5e51ff2e4c205adfbaa117
1 file changed
+2
-1
Documentation/git-rebase.txt
+2
-1
@@ -445,7 +445,8 @@ When --fork-point is active, 'fork_point' will be used instead of
445
ends up being empty, the <upstream> will be used as a fallback.
446
+
447
If <upstream> is given on the command line, then the default is
448
-`--no-fork-point`, otherwise the default is `--fork-point`.
448
+`--no-fork-point`, otherwise the default is `--fork-point`. See also
449
+`rebase.forkpoint` in linkgit:git-config[1].
450
+
451
If your branch was based on <upstream> but <upstream> was rewound and
452
your branch contains commits which were dropped, this option can be used