)]}'
{
  "commit": "d1014a1745a8aa90c8de2a5ac7624d8175f96724",
  "tree": "f70bf896fec309c221cd9b7b5073f5e87d32eab5",
  "parents": [
    "9d0524d42f340fc49f9e175d966afb7dce3854bb"
  ],
  "author": {
    "name": "Junio C Hamano",
    "email": "junkio@cox.net",
    "time": "Sun Dec 31 23:21:50 2006 -0800"
  },
  "committer": {
    "name": "Junio C Hamano",
    "email": "junkio@cox.net",
    "time": "Mon Jan 01 14:35:16 2007 -0800"
  },
  "message": "fail pull/merge early in the middle of conflicted merge\n\nAfter a pull that results in a conflicted merge, a new user\noften tries another \"git pull\" in desperation.  When the index\nis unmerged, merge backends correctly bail out without touching\neither index nor the working tree, so this does not make the\nwound any worse.\n\nThe user will however see several lines of messsages during this\nprocess, such as \"filename: needs merge\", \"you need to resolve\nyour current index first\", \"Merging...\", and \"Entry ... would be\noverwritten by merge. Cannot merge.\".  They are unnecessarily\nalarming, and cause useful conflict messages from the first pull\nscroll off the top of the terminal.\n\nThis changes pull and merge to run \"git-ls-files -u\" upfront and\nstop them much earlier than we currently do.  Old timers may\nknow better and would not to try pulling again before cleaning\nthings up; this change adds extra overhead that is unnecessary\nfor them.  But this would be worth paying for to save new people\nfrom needless confusion.\n\nSigned-off-by: Junio C Hamano \u003cjunkio@cox.net\u003e\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "ba42260426296b63070a1fbdc22a9b77ea5ac412",
      "old_mode": 33261,
      "old_path": "git-merge.sh",
      "new_id": "477002910ede7f6bc6bcb9a79f6ddebd248f6bd2",
      "new_mode": 33261,
      "new_path": "git-merge.sh"
    },
    {
      "type": "modify",
      "old_id": "28d08195f0c84b7f3a89a5c5cff9945bb64ddfb3",
      "old_mode": 33261,
      "old_path": "git-pull.sh",
      "new_id": "c184fb81a4dab622d79120bcc986c3bf2b07df7f",
      "new_mode": 33261,
      "new_path": "git-pull.sh"
    }
  ]
}