diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-10-06 14:18:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-06 14:18:33 -0700 |
| commit | 05971eb76ddbc27b8e5624df0761184bebc000e3 (patch) | |
| tree | 6e1b6e5f43eb91dda78341606a7cabc454e2df7f /git-rebase.txt | |
| parent | 6a7e26352ec87c982c77187895cfcc309d16386e (diff) | |
| download | git-htmldocs-05971eb76ddbc27b8e5624df0761184bebc000e3.tar.gz | |
Autogenerated HTML docs for v2.33.0-721-g10629
Diffstat (limited to 'git-rebase.txt')
| -rw-r--r-- | git-rebase.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index 506345cb0..c116dbf4b 100644 --- a/git-rebase.txt +++ b/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 |