)]}'
{
  "commit": "d08af0ad745869a4fe36bc8df4f9804edfb74eb9",
  "tree": "e12eb7e4ce147d4f4c386a8da97c3748950c84ca",
  "parents": [
    "aec7b362ad07e1a2c58051c8db653dabffee8960"
  ],
  "author": {
    "name": "Lars Hjemli",
    "email": "hjemli@gmail.com",
    "time": "Mon Sep 24 00:51:44 2007 +0200"
  },
  "committer": {
    "name": "Junio C Hamano",
    "email": "gitster@pobox.com",
    "time": "Sun Sep 23 17:14:03 2007 -0700"
  },
  "message": "git-merge: add support for --commit and --no-squash\n\nThese options can be used to override --no-commit and --squash, which is\nneeded since --no-commit and --squash now can be specified as default merge\noptions in $GIT_DIR/config.\n\nThe change also introduces slightly different behavior for --no-commit:\nwhen specified, it explicitly overrides --squash. Earlier,\n\u0027git merge --squash --no-commit\u0027 would result in a squashed merge (i.e. no\n$GIT_DIR/MERGE_HEAD was created) but with this patch the command will\nbehave as if --squash hadn\u0027t been specified.\n\nSigned-off-by: Lars Hjemli \u003chjemli@gmail.com\u003e\nSigned-off-by: Junio C Hamano \u003cgitster@pobox.com\u003e\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "d64c259bb35d3140b371e8717a2553146d3f92f5",
      "old_mode": 33188,
      "old_path": "Documentation/merge-options.txt",
      "new_id": "0464a346450437493effa497757582c19bb0a5dd",
      "new_mode": 33188,
      "new_path": "Documentation/merge-options.txt"
    },
    {
      "type": "modify",
      "old_id": "a35b15157bd2838175e8400e67ca272b39b8e921",
      "old_mode": 33261,
      "old_path": "git-merge.sh",
      "new_id": "a0fc60602a512c05159e1665fb812941ab020606",
      "new_mode": 33261,
      "new_path": "git-merge.sh"
    },
    {
      "type": "modify",
      "old_id": "110974cd01ad0fa613eb50555af6e547dabb1f49",
      "old_mode": 33261,
      "old_path": "t/t7600-merge.sh",
      "new_id": "b0ef488c2955f9c5d267d8dc1311614fce4cbf3f",
      "new_mode": 33261,
      "new_path": "t/t7600-merge.sh"
    }
  ]
}