]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'js/builtin-rebase-perf-fix-err-fix'
authorJunio C Hamano <gitster@pobox.com>
Wed, 21 Nov 2018 11:39:01 +0000 (20:39 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 Nov 2018 11:39:01 +0000 (20:39 +0900)
commitc17f086ecad796b4179aa1b0209f00d4f8ffdc0f
tree2b26a57bd1b47f159447f11df86702907377b047
parentbb75be6cb916297f271c846f2f9caa3daaaec718
parent4d86503eed995fe27bfa284b55fc63328534d11b
Merge branch 'js/builtin-rebase-perf-fix-err-fix'

The object name of the tree reported in a recently added error
message was wrong, which has been corrected.

* js/builtin-rebase-perf-fix-err-fix:
  rebase: warn about the correct tree's OID
builtin/rebase.c