]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ef9b086 9e5ebe9)
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)
"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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.