diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-05-01 14:53:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-05-01 14:53:51 -0700 |
| commit | 864182b6457faf2455894d9a200acda0751f3c80 (patch) | |
| tree | 06ab5e096eab9ff6ae4bcb46ce9f1c2515f43ff0 /git-rebase.txt | |
| parent | 67cc2b7cdda7af3a7079b399a8a154d094efc649 (diff) | |
| download | git-htmldocs-864182b6457faf2455894d9a200acda0751f3c80.tar.gz | |
Autogenerated HTML docs for v2.26.2-533-gb34789
Diffstat (limited to 'git-rebase.txt')
| -rw-r--r-- | git-rebase.txt | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index c70c1ec5e..794f2f39f 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -449,12 +449,14 @@ When --fork-point is active, 'fork_point' will be used instead of <branch>` command (see linkgit:git-merge-base[1]). If 'fork_point' ends up being empty, the <upstream> will be used as a fallback. + -If either <upstream> or --root is given on the command line, then the -default is `--no-fork-point`, otherwise the default is `--fork-point`. +If <upstream> is given on the command line, then the default is +`--no-fork-point`, otherwise the default is `--fork-point`. + If your branch was based on <upstream> but <upstream> was rewound and your branch contains commits which were dropped, this option can be used with `--keep-base` in order to drop those commits from your branch. ++ +See also INCOMPATIBLE OPTIONS below. --ignore-whitespace:: --whitespace=<option>:: @@ -636,6 +638,7 @@ In addition, the following pairs of options are incompatible: * --preserve-merges and --empty= * --keep-base and --onto * --keep-base and --root + * --fork-point and --root BEHAVIORAL DIFFERENCES ----------------------- |