diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-21 20:39:01 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-21 20:39:01 +0900 |
| commit | c17f086ecad796b4179aa1b0209f00d4f8ffdc0f (patch) | |
| tree | 2b26a57bd1b47f159447f11df86702907377b047 /merge-blobs.c | |
| parent | bb75be6cb916297f271c846f2f9caa3daaaec718 (diff) | |
| parent | 4d86503eed995fe27bfa284b55fc63328534d11b (diff) | |
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
Diffstat (limited to 'merge-blobs.c')
0 files changed, 0 insertions, 0 deletions