]> git.ipfire.org Git - thirdparty/git.git/commit
rebase: display an error if --root and --fork-point are both provided
authorElijah Newren <newren@gmail.com>
Mon, 27 Apr 2020 17:59:49 +0000 (17:59 +0000)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Apr 2020 18:51:26 +0000 (11:51 -0700)
commita35413c3785bf71e2c018691d6cd5f93638ba9ae
treeea9e3eff8827e29bfe27c5d7f078d3b9323d6c6c
parentaf6b65d45ef179ed52087e80cb089f6b2349f4ec
rebase: display an error if --root and --fork-point are both provided

--root implies we want to rebase all commits since the beginning of
history.  --fork-point means we want to use the reflog of the specified
upstream to find the best common ancestor between <upstream> and
<branch> and only rebase commits since that common ancestor.  These
options are clearly contradictory, so throw an error (instead of
segfaulting on a NULL pointer) if both are specified.

Reported-by: Alexander Berg <alexander.berg@atos.net>
Documentation-by: Alban Gruin <alban.gruin@gmail.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-rebase.txt
builtin/rebase.c