summaryrefslogtreecommitdiff
path: root/t/t4013/diff.log_-p_master
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2020-04-27 17:59:49 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-04-27 11:51:26 -0700
commita35413c3785bf71e2c018691d6cd5f93638ba9ae (patch)
treeea9e3eff8827e29bfe27c5d7f078d3b9323d6c6c /t/t4013/diff.log_-p_master
parentGit 2.26.2 (diff)
downloadtgif-a35413c3785bf71e2c018691d6cd5f93638ba9ae.tar.xz
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>
Diffstat (limited to 't/t4013/diff.log_-p_master')
0 files changed, 0 insertions, 0 deletions