diff options
| author | Alex Henrie <alexhenrie24@gmail.com> | 2022-04-20 22:42:33 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-04-21 09:35:45 -0700 |
| commit | 9e5ebe9668a0f152757182b80bae9b66aad11952 (patch) | |
| tree | b56ecd11d2a5995b00c8050bb2ad419567849969 /combine-diff.c | |
| parent | Git 2.36 (diff) | |
| download | git-9e5ebe9668a0f152757182b80bae9b66aad11952.tar.gz git-9e5ebe9668a0f152757182b80bae9b66aad11952.zip | |
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 'combine-diff.c')
0 files changed, 0 insertions, 0 deletions