)]}'
{
  "commit": "eb8dc05c3d364174a6b694e2850ffd6cfe32c6d3",
  "tree": "f462cc65dabea04bdf6e6ea0441bbca279899ede",
  "parents": [
    "3d4a3ffe64162b45ae7c991fc60623ecb4678cfd"
  ],
  "author": {
    "name": "Paul Tan",
    "email": "pyokagan@gmail.com",
    "time": "Mon May 18 21:45:41 2015 +0800"
  },
  "committer": {
    "name": "Junio C Hamano",
    "email": "gitster@pobox.com",
    "time": "Mon May 18 11:22:27 2015 -0700"
  },
  "message": "pull: make pull.ff\u003dtrue override merge.ff\n\nSince b814da8 (pull: add pull.ff configuration, 2014-01-15), running\ngit-pull with the configuration pull.ff\u003dfalse or pull.ff\u003donly is\nequivalent to passing --no-ff and --ff-only to git-merge. However, if\npull.ff\u003dtrue, no switch is passed to git-merge. This leads to the\nconfusing behavior where pull.ff\u003dfalse or pull.ff\u003donly is able to\noverride merge.ff, while pull.ff\u003dtrue is unable to.\n\nFix this by adding the --ff switch if pull.ff\u003dtrue, and add a test to\ncatch future regressions.\n\nFurthermore, clarify in the documentation that pull.ff overrides\nmerge.ff.\n\nSigned-off-by: Paul Tan \u003cpyokagan@gmail.com\u003e\nReviewed-by: Johannes Schindelin \u003cjohannes.schindelin@gmx.de\u003e\nSigned-off-by: Junio C Hamano \u003cgitster@pobox.com\u003e\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "2e5ceaf71974b1e5404de79103648da1829eaf42",
      "old_mode": 33188,
      "old_path": "Documentation/config.txt",
      "new_id": "f45bef13ae57e6f67e8a6559e81d75c9610b3734",
      "new_mode": 33188,
      "new_path": "Documentation/config.txt"
    },
    {
      "type": "modify",
      "old_id": "4d4fc77b05648c7d2d76ae932b7d68cdf411d364",
      "old_mode": 33261,
      "old_path": "git-pull.sh",
      "new_id": "2aea4fa38a7e2dcb945b419aa44ca89a5fe5b874",
      "new_mode": 33261,
      "new_path": "git-pull.sh"
    },
    {
      "type": "modify",
      "old_id": "f768c900abd1cddc6d69a1bdeae897374e7d0dad",
      "old_mode": 33261,
      "old_path": "t/t7601-merge-pull-config.sh",
      "new_id": "c6c44ec570dac66ca9a800ac687280cd3597e886",
      "new_mode": 33261,
      "new_path": "t/t7601-merge-pull-config.sh"
    }
  ]
}