diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-10-06 13:40:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-06 13:40:12 -0700 |
| commit | 6926f2e135710742cc6ea6816e1a15889d13b64b (patch) | |
| tree | 5b72f0c385cfa8bbb4576cd340f8eb037d5f98f7 /Documentation/git-rebase.txt | |
| parent | 4513972086853ccd24e2d84c6f00a9a99d03bff7 (diff) | |
| parent | d1e894c6d7061098ef5e51ff2e4c205adfbaa117 (diff) | |
| download | git-6926f2e135710742cc6ea6816e1a15889d13b64b.tar.gz | |
Merge branch 'ws/refer-to-forkpoint-config-in-rebase-doc'
Doc update.
* ws/refer-to-forkpoint-config-in-rebase-doc:
Document `rebase.forkpoint` in rebase man page
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 506345cb0e..c116dbf4bb 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 |