Skip to content

Commit d1e894c

Browse files
Wesley Schwenglegitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 225bc32 commit d1e894c

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

Documentation/git-rebase.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,8 @@ When --fork-point is active, 'fork_point' will be used instead of
445445
ends up being empty, the <upstream> will be used as a fallback.
446446
+
447447
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].
449450
+
450451
If your branch was based on <upstream> but <upstream> was rewound and
451452
your branch contains commits which were dropped, this option can be used

0 commit comments

Comments
 (0)