Files
git/Documentation
Junio C Hamano ae46d5fb98 Merge branch 'js/merge-tree-3-trees'
"git merge-tree" has learned that the three trees involved in the
3-way merge only need to be trees, not necessarily commits.

* js/merge-tree-3-trees:
  fill_tree_descriptor(): mark error message for translation
  cache-tree: avoid an unnecessary check
  Always check `parse_tree*()`'s return value
  t4301: verify that merge-tree fails on missing blob objects
  merge-ort: do check `parse_tree()`'s return value
  merge-tree: fail with a non-zero exit code on missing tree objects
  merge-tree: accept 3 trees as arguments
2024-03-07 15:59:41 -08:00
..
2024-03-05 09:44:44 -08:00
2023-10-30 07:09:55 +09:00
2024-02-27 16:04:31 -08:00
2023-11-26 10:07:05 +09:00
2023-06-12 13:52:51 -07:00
2023-10-09 12:06:24 -07:00
2023-10-09 12:06:29 -07:00
2023-11-26 10:07:05 +09:00
2023-12-26 11:06:55 -08:00
2024-02-21 10:02:55 -08:00
2023-10-09 12:06:29 -07:00
2023-06-12 13:52:51 -07:00
2023-06-12 13:52:51 -07:00
2024-01-02 13:51:30 -08:00
2023-10-09 12:06:24 -07:00
2024-03-07 15:59:40 -08:00
2023-10-09 12:06:29 -07:00
2023-12-14 14:38:07 -08:00
2023-12-26 11:06:55 -08:00
2023-08-28 09:16:06 -07:00
2023-11-26 10:07:05 +09:00
2023-12-26 11:06:55 -08:00