summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWesley Schwengle <wesley@opperschaap.net>2021-09-16 22:46:03 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-09-20 16:05:48 (GMT)
commitd1e894c6d7061098ef5e51ff2e4c205adfbaa117 (patch)
tree4b58ceb1600943b1bbc4fb020ec10d4337614055
parent225bc32a989d7a22fa6addafd4ce7dcd04675dbf (diff)
downloadgit-d1e894c6d7061098ef5e51ff2e4c205adfbaa117.zip
git-d1e894c6d7061098ef5e51ff2e4c205adfbaa117.tar.gz
git-d1e894c6d7061098ef5e51ff2e4c205adfbaa117.tar.bz2
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>
-rw-r--r--Documentation/git-rebase.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 55af6fd..2c8558d 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 <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`. See also
+`rebase.forkpoint` in linkgit:git-config[1].
+
If your branch was based on <upstream> but <upstream> was rewound and
your branch contains commits which were dropped, this option can be used