summaryrefslogtreecommitdiff
path: root/builtin/commit-graph.c
diff options
context:
space:
mode:
authorAlex Henrie <alexhenrie24@gmail.com>2022-04-20 22:42:33 -0600
committerJunio C Hamano <gitster@pobox.com>2022-04-21 09:35:45 -0700
commit9e5ebe9668a0f152757182b80bae9b66aad11952 (patch)
treeb56ecd11d2a5995b00c8050bb2ad419567849969 /builtin/commit-graph.c
parent6cd33dceed60949e2dbc32e3f0f5e67c4c882e1e (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>
Diffstat (limited to 'builtin/commit-graph.c')
0 files changed, 0 insertions, 0 deletions