diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-05-01 20:39:58 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-05-01 20:39:58 (GMT) |
| commit | 6d6b412da32229bf6a5f366a72b5ad29cc70ce59 (patch) | |
| tree | b7536738d6dec7ff9cd60a9a891cc5e3e9f7e12e /Documentation | |
| parent | aabf3ea14439bccc87bdfd3d23315a19f928fab4 (diff) | |
| parent | a35413c3785bf71e2c018691d6cd5f93638ba9ae (diff) | |
| download | git-6d6b412da32229bf6a5f366a72b5ad29cc70ce59.zip git-6d6b412da32229bf6a5f366a72b5ad29cc70ce59.tar.gz git-6d6b412da32229bf6a5f366a72b5ad29cc70ce59.tar.bz2 | |
Merge branch 'en/rebase-root-and-fork-point-are-incompatible'
Incompatible options "--root" and "--fork-point" of "git rebase"
have been marked and documented as being incompatible.
* en/rebase-root-and-fork-point-are-incompatible:
rebase: display an error if --root and --fork-point are both provided
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-rebase.txt | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index c70c1ec..794f2f3 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/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 ----------------------- |