)]}'
{
  "commit": "a54841e96b78203598dea6b31b9618f40f107e7b",
  "tree": "76465742ce499ceed97377fe792e881e0a5da1bb",
  "parents": [
    "7a3187eb788854ed3a20fee30b27e68430f753b7"
  ],
  "author": {
    "name": "Miklos Vajna",
    "email": "vmiklos@suse.cz",
    "time": "Tue Jul 02 16:47:57 2013 +0200"
  },
  "committer": {
    "name": "Junio C Hamano",
    "email": "gitster@pobox.com",
    "time": "Tue Jul 02 13:08:42 2013 -0700"
  },
  "message": "merge: handle --ff/--no-ff/--ff-only as a tri-state option\n\nThese three options mean \"favor fast-forwarding when possible,\nwithout creating an unnecessary merge\", \"never fast-forward and\nalways create a merge commit even when the commit being merged is a\nstrict descendant\", and \"we do not want to create any merge commit;\nupdate only when the merged commit is a strict descendant\".\n\nThey are \"pick one out of these three possibilities\" options, and\ncorrespond to \"merge.ff\" configuration that is tri-state (yes, no\nand only).\n\nHowever, the implementation did not follow the usual convention for\nthe command line options (later one wins, and command line overrides\nwhat is in the configuration).\n\nFix this by consolidating two variables (fast_forward_only and\nallow_fast_forward) used in the implementation into one enum that\ncan take one of the three possible values.\n\nSigned-off-by: Miklos Vajna \u003cvmiklos@suse.cz\u003e\nSigned-off-by: Junio C Hamano \u003cgitster@pobox.com\u003e\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "2ebe732896c1b3bfd920941b5182b793468c0afe",
      "old_mode": 33188,
      "old_path": "builtin/merge.c",
      "new_id": "149f32afb6eede8b65d1eed9f5def9237e0a908a",
      "new_mode": 33188,
      "new_path": "builtin/merge.c"
    },
    {
      "type": "modify",
      "old_id": "460d8ebf48f9ab3826e58e2e9285f6faecd79b78",
      "old_mode": 33261,
      "old_path": "t/t7600-merge.sh",
      "new_id": "3ff5fb853c941586e3e5ed69a74a628dfe5bb84a",
      "new_mode": 33261,
      "new_path": "t/t7600-merge.sh"
    }
  ]
}