)]}'
{
  "commit": "42b491786260eb17d97ea9fb1c4b70075bca9523",
  "tree": "3c330360a9fdc6abf984c5497ae3c9668009cf10",
  "parents": [
    "329484256e0fe42676e93669122e7a5a007ef4ed"
  ],
  "author": {
    "name": "Johan Herland",
    "email": "johan@herland.net",
    "time": "Wed Jun 03 00:59:12 2009 +0200"
  },
  "committer": {
    "name": "Junio C Hamano",
    "email": "gitster@pobox.com",
    "time": "Wed Jun 03 00:09:16 2009 -0700"
  },
  "message": "git-submodule: add support for --merge.\n\n\u0027git submodule update --merge\u0027 merges the commit referenced by the\nsuperproject into your local branch, instead of checking it out on\na detached HEAD.\n\nAs evidenced by the addition of \"git submodule update --rebase\", it\nis useful to provide alternatives to the default \u0027checkout\u0027 behaviour\nof \"git submodule update\". One such alternative is, when updating a\nsubmodule to a new commit, to merge that commit into the current\nlocal branch in that submodule. This is useful in workflows where\nyou want to update your submodule from its upstream, but you cannot\nuse --rebase, because you have downstream people working on top of\nyour submodule branch, and you don\u0027t want to disrupt their work.\n\nSigned-off-by: Johan Herland \u003cjohan@herland.net\u003e\nSigned-off-by: Junio C Hamano \u003cgitster@pobox.com\u003e\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "f993469dc642d6fc84a07826c3782b8e22e3e223",
      "old_mode": 33188,
      "old_path": "Documentation/git-submodule.txt",
      "new_id": "2289d11f0e350886296bf961a9acb2e9b6f0ffd9",
      "new_mode": 33188,
      "new_path": "Documentation/git-submodule.txt"
    },
    {
      "type": "modify",
      "old_id": "1b67f0a9f12974afca2e8e6948d0fca564b9b17b",
      "old_mode": 33188,
      "old_path": "Documentation/gitmodules.txt",
      "new_id": "5daf750d1942f3b97844b4ef378daf9346cb46d4",
      "new_mode": 33188,
      "new_path": "Documentation/gitmodules.txt"
    },
    {
      "type": "modify",
      "old_id": "f384c6b2b4953110ab0f892aabdbb826ac2263da",
      "old_mode": 33261,
      "old_path": "git-submodule.sh",
      "new_id": "3aff37970ad22c2498e1b2755a214e2fdb183f21",
      "new_mode": 33261,
      "new_path": "git-submodule.sh"
    },
    {
      "type": "modify",
      "old_id": "0773fe405bb792e82b658c7cea2d8815163ccd19",
      "old_mode": 33261,
      "old_path": "t/t7406-submodule-update.sh",
      "new_id": "2d33d9efec3f2f601305e736e31368621acd0584",
      "new_mode": 33261,
      "new_path": "t/t7406-submodule-update.sh"
    }
  ]
}