]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'ah/rebase-keep-base-fix'
authorJunio C Hamano <gitster@pobox.com>
Wed, 11 May 2022 20:56:21 +0000 (13:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 May 2022 20:56:21 +0000 (13:56 -0700)
commit202161fa8ddce803bd63b9687ac15ff2b016c14d
tree62d828de138e1f40ddcd7327b39ce763c06ce2b5
parentef9b086d95e4f6676d588f4b0deebeaa76bf2a41
parent9e5ebe9668a0f152757182b80bae9b66aad11952
Merge branch 'ah/rebase-keep-base-fix'

"git rebase --keep-base <upstream> <branch-to-rebase>" computed the
commit to rebase onto incorrectly, which has been corrected.

* ah/rebase-keep-base-fix:
  rebase: use correct base for --keep-base when a branch is given