]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jc/rebase-detach-fix'
authorJunio C Hamano <gitster@pobox.com>
Tue, 29 Mar 2022 19:22:03 +0000 (12:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 29 Mar 2022 19:22:03 +0000 (12:22 -0700)
"git rebase $base $non_branch_commit", when $base is an ancestor or
the $non_branch_commit, modified the current branch, which has been
corrected.

* jc/rebase-detach-fix:
  rebase: set REF_HEAD_DETACH in checkout_up_to_date()
  rebase: use test_commit helper in setup


Trivial merge