)]}'
{
  "commit": "0cf8581e330e7140c9f5c94a53d441187c0f8ff9",
  "tree": "a1e46a0198f62914d29e8e1429b8efce58ada4ee",
  "parents": [
    "29a1f99b4b81cd28163de1275265234c5ab804b4"
  ],
  "author": {
    "name": "Junio C Hamano",
    "email": "gitster@pobox.com",
    "time": "Sat Aug 30 07:52:24 2008 -0700"
  },
  "committer": {
    "name": "Junio C Hamano",
    "email": "gitster@pobox.com",
    "time": "Sat Aug 30 19:57:55 2008 -0700"
  },
  "message": "checkout -m: recreate merge when checking out of unmerged index\n\nThis teaches git-checkout to recreate a merge out of unmerged\nindex entries while resolving conflicts.\n\nWith this patch, checking out an unmerged path from the index\nnow have the following possibilities:\n\n * Without any option, an attempt to checkout an unmerged path\n   will atomically fail (i.e. no other cleanly-merged paths are\n   checked out either);\n\n * With \"-f\", other cleanly-merged paths are checked out, and\n   unmerged paths are ignored;\n\n * With \"--ours\" or \"--theirs, the contents from the specified\n   stage is checked out;\n\n * With \"-m\" (we should add \"--merge\" as synonym), the 3-way merge\n   is recreated from the staged object names and checked out.\n\nSigned-off-by: Junio C Hamano \u003cgitster@pobox.com\u003e\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "a9ca2f552017cc592c8ff6b553bf0bbf875646a0",
      "old_mode": 33188,
      "old_path": "Documentation/git-checkout.txt",
      "new_id": "c884862e2fb91831c3962599507b4034d4bcb77e",
      "new_mode": 33188,
      "new_path": "Documentation/git-checkout.txt"
    },
    {
      "type": "modify",
      "old_id": "16bfbb66055951e44c19410b6c889b3aa63891ec",
      "old_mode": 33188,
      "old_path": "builtin-checkout.c",
      "new_id": "b957193155f799ebea0cabcc7496408d4d96d599",
      "new_mode": 33188,
      "new_path": "builtin-checkout.c"
    },
    {
      "type": "modify",
      "old_id": "c7ae14118a538414c71170516d683a888878a656",
      "old_mode": 33261,
      "old_path": "t/t7201-co.sh",
      "new_id": "1d4ff6e8d30ce49a2792107be1c23a66b1df3a8b",
      "new_mode": 33261,
      "new_path": "t/t7201-co.sh"
    }
  ]
}
