diff options
| author | Wesley Schwengle <wesley@opperschaap.net> | 2021-09-16 18:46:03 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-20 09:05:48 -0700 |
| commit | d1e894c6d7061098ef5e51ff2e4c205adfbaa117 (patch) | |
| tree | 4b58ceb1600943b1bbc4fb020ec10d4337614055 /Documentation/git-rebase.txt | |
| parent | 225bc32a989d7a22fa6addafd4ce7dcd04675dbf (diff) | |
| download | git-d1e894c6d7061098ef5e51ff2e4c205adfbaa117.tar.gz | |
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>
Diffstat (limited to 'Documentation/git-rebase.txt')
| -rw-r--r-- | Documentation/git-rebase.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 55af6fd24e..2c8558d98c 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 |