Merge branch 'ws/refer-to-forkpoint-config-in-rebase-doc'

gitster · gitster · commit 6926f2e13571 · 2021-10-06T13:40:12.000-07:00
Doc update.

* ws/refer-to-forkpoint-config-in-rebase-doc:
  Document `rebase.forkpoint` in rebase man page
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -446,7 +446,8 @@ When --fork-point is active, 'fork_point' will be used instead of`
`446`	`446`	`ends up being empty, the <upstream> will be used as a fallback.`
`447`	`447`	`+`
`448`	`448`	`If <upstream> is given on the command line, then the default is`
`449`		-`--no-fork-point`, otherwise the default is `--fork-point`.
	`449`	+`--no-fork-point`, otherwise the default is `--fork-point`. See also
	`450`	+`rebase.forkpoint` in linkgit:git-config[1].
`450`	`451`	`+`
`451`	`452`	`If your branch was based on <upstream> but <upstream> was rewound and`
`452`	`453`	`your branch contains commits which were dropped, this option can be used`