diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-05-01 13:39:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-05-01 13:39:58 -0700 |
| commit | 6d6b412da32229bf6a5f366a72b5ad29cc70ce59 (patch) | |
| tree | b7536738d6dec7ff9cd60a9a891cc5e3e9f7e12e /builtin/rebase.c | |
| parent | Merge branch 'ds/build-homebrew-gettext-fix' (diff) | |
| parent | rebase: display an error if --root and --fork-point are both provided (diff) | |
| download | tgif-6d6b412da32229bf6a5f366a72b5ad29cc70ce59.tar.xz | |
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 'builtin/rebase.c')
| -rw-r--r-- | builtin/rebase.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index 1c0a49c642..8cbfc5106e 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -1481,6 +1481,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) die(_("cannot combine '--keep-base' with '--root'")); } + if (options.root && fork_point > 0) + die(_("cannot combine '--root' with '--fork-point'")); + if (action != ACTION_NONE && !in_progress) die(_("No rebase in progress?")); setenv(GIT_REFLOG_ACTION_ENVIRONMENT, "rebase", 0); |