)]}'
{
  "commit": "54f98fee5069f50c6e96687504b82a7695c8648a",
  "tree": "744883c40121a184bece4e5cffffb913ed29e0fa",
  "parents": [
    "c0a4ae7f4e010204f8341dcc3b9217dd42baee14"
  ],
  "author": {
    "name": "Junio C Hamano",
    "email": "gitster@pobox.com",
    "time": "Mon Jul 31 15:44:07 2023 -0700"
  },
  "committer": {
    "name": "Junio C Hamano",
    "email": "gitster@pobox.com",
    "time": "Mon Jul 31 16:10:54 2023 -0700"
  },
  "message": "checkout/restore: refuse unmerging paths unless checking out of the index\n\nRecreating unmerged index entries using resolve-undo data,\nrecreating conflicted working tree files using unmerged index\nentries, and writing data out of unmerged index entries, make\nsense only when we are checking paths out of the index and not when\nwe are checking paths out of a tree-ish.\n\nAdd an extra check to make sure \"--merge\" and \"--ours/--theirs\"\noptions are rejected when checking out from a tree-ish, update the\ndocument (especially the SYNOPSIS section) to highlight that they\nare incompatible, and add a few tests to make sure the combination\nfails.\n\nSigned-off-by: Junio C Hamano \u003cgitster@pobox.com\u003e\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "4af0904f4729b463d3b63bf3479f5e4b313773fd",
      "old_mode": 33188,
      "old_path": "Documentation/git-checkout.txt",
      "new_id": "a30e3ebc51fbe92ce485b5f72f56c69cd179c330",
      "new_mode": 33188,
      "new_path": "Documentation/git-checkout.txt"
    },
    {
      "type": "modify",
      "old_id": "5964810caa4153a6628ca312669a77a90b41943a",
      "old_mode": 33188,
      "old_path": "Documentation/git-restore.txt",
      "new_id": "c70444705b545f1a2af86369cddca052c9f9e0c9",
      "new_mode": 33188,
      "new_path": "Documentation/git-restore.txt"
    },
    {
      "type": "modify",
      "old_id": "715eeb5048f99a1b27cd859596b03bc4f073081a",
      "old_mode": 33188,
      "old_path": "builtin/checkout.c",
      "new_id": "b8dfba57c68bcdc080123c995ca94d6e1106bb32",
      "new_mode": 33188,
      "new_path": "builtin/checkout.c"
    },
    {
      "type": "modify",
      "old_id": "c5d19dd973d7f4ea7a3a496d7df92a5c74fa667d",
      "old_mode": 33261,
      "old_path": "t/t2070-restore.sh",
      "new_id": "fd775807e7c9d8b74c7930bb72386e1221fb9cef",
      "new_mode": 33261,
      "new_path": "t/t2070-restore.sh"
    },
    {
      "type": "modify",
      "old_id": "61ad47b0c18d231c60327acda04348895947809c",
      "old_mode": 33261,
      "old_path": "t/t7201-co.sh",
      "new_id": "23d4dadbcc0a7fe630f0e9ca27d1ce0c07805426",
      "new_mode": 33261,
      "new_path": "t/t7201-co.sh"
    }
  ]
}