From a35413c3785bf71e2c018691d6cd5f93638ba9ae Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Mon, 27 Apr 2020 17:59:49 +0000 Subject: 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 and 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 Documentation-by: Alban Gruin Signed-off-by: Elijah Newren Signed-off-by: Junio C Hamano --- Documentation/git-rebase.txt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'Documentation/git-rebase.txt') diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index f7a6033607..fbad356c68 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -414,12 +414,14 @@ When --fork-point is active, 'fork_point' will be used instead of ` command (see linkgit:git-merge-base[1]). If 'fork_point' ends up being empty, the will be used as a fallback. + -If either or --root is given on the command line, then the -default is `--no-fork-point`, otherwise the default is `--fork-point`. +If 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 but 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=