summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-09-23 20:45:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-09-23 20:45:17 (GMT)
commit690d443a26acca666db6f9249e3224f3f341aa5b (patch)
tree1c61041ef3ab73b3ba32843c615fc7f53450342f
parentdb1e533058289ddb577e10d623c1482400b45d91 (diff)
parentd1e894c6d7061098ef5e51ff2e4c205adfbaa117 (diff)
downloadgit-690d443a26acca666db6f9249e3224f3f341aa5b.zip
git-690d443a26acca666db6f9249e3224f3f341aa5b.tar.gz
git-690d443a26acca666db6f9249e3224f3f341aa5b.tar.bz2
Merge branch 'ws/refer-to-forkpoint-config-in-rebase-doc' into jch
Doc update. * ws/refer-to-forkpoint-config-in-rebase-doc: Document `rebase.forkpoint` in rebase man page
-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 de6d128..a1af21f 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`. 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