]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6cd33dc) | patch
rebase: use correct base for --keep-base when a branch is given
authorAlex Henrie <alexhenrie24@gmail.com>
Thu, 21 Apr 2022 04:42:33 +0000 (22:42 -0600)
committerJunio C Hamano <gitster@pobox.com>
Thu, 21 Apr 2022 16:35:45 +0000 (09:35 -0700)
commit9e5ebe9668a0f152757182b80bae9b66aad11952
treeb56ecd11d2a5995b00c8050bb2ad419567849969tree | snapshot
parent6cd33dceed60949e2dbc32e3f0f5e67c4c882e1ecommit | diff
rebase: use correct base for --keep-base when a branch is given

--keep-base rebases onto the merge base of the given upstream and the
current HEAD regardless of whether a branch is given. This is contrary
to the documentation and to the option's intended purpose. Instead,
rebase onto the merge base of the given upstream and the given branch.

Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-rebase.txt diff | blob | blame | history
builtin/rebase.c diff | blob | blame | history
t/t3416-rebase-onto-threedots.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.