)]}'
{
  "commit": "b4dc085a8dc2ec2fb5f6366fa672222b807ed655",
  "tree": "980f8140e6055383ed1ddfa7de86085b7a6e9462",
  "parents": [
    "9f48f2bd9ae8db8cdce3a8e2c9b6dc33b2a55ee1"
  ],
  "author": {
    "name": "Thomas Rast",
    "email": "trast@inf.ethz.ch",
    "time": "Thu Jun 20 18:38:28 2013 -0400"
  },
  "committer": {
    "name": "Junio C Hamano",
    "email": "gitster@pobox.com",
    "time": "Thu Jun 20 15:51:35 2013 -0700"
  },
  "message": "pull: merge into unborn by fast-forwarding from empty tree\n\nThe logic for pulling into an unborn branch was originally\ndesigned to be used on a newly-initialized repository\n(d09e79c, git-pull: allow pulling into an empty repository,\n2006-11-16).  It thus did not initially deal with\nuncommitted changes in the unborn branch.  The case of an\n_unstaged_ untracked file was fixed by 4b3ffe5 (pull: do not\nclobber untracked files on initial pull, 2011-03-25).\nHowever, it still clobbered existing staged files, both when\nthe file exists in the merged commit (it will be\noverwritten), and when it does not (it will be deleted).\n\nWe fix this by doing a two-way merge, where the \"current\"\nside of the merge is an empty tree, and the \"target\" side is\nHEAD (already updated to FETCH_HEAD at this point).  This\namounts to claiming that all work in the index was done vs.\nan empty tree, and thus all content of the index is\nprecious.\n\nNote that this use of read-tree just gives us protection\nagainst overwriting index and working tree changes. It will\nnot actually result in a 3-way merge conflict in the index.\nThis is fine, as this is a rare situation, and the conflict\nwould not be interesting anyway (it must, by definition, be\nan add/add conflict with the whole content conflicting). And\nit makes it simpler for the user to recover, as they have no\nHEAD to \"git reset\" back to.\n\nReported-by: Stefan Schüßler \u003cmail@stefanschuessler.de\u003e\nSigned-off-by: Thomas Rast \u003ctrast@inf.ethz.ch\u003e\nSigned-off-by: Jeff King \u003cpeff@peff.net\u003e\nSigned-off-by: Junio C Hamano \u003cgitster@pobox.com\u003e\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "f323f56bcb2f0c2fe443841422be2b72dcf74bb6",
      "old_mode": 33261,
      "old_path": "git-pull.sh",
      "new_id": "2c502171f7fb7bc6e13c65dfd72e920e8b021a3b",
      "new_mode": 33261,
      "new_path": "git-pull.sh"
    },
    {
      "type": "modify",
      "old_id": "35304b41e9ce6222f7d713e3d310e47241d8e6e0",
      "old_mode": 33261,
      "old_path": "t/t5520-pull.sh",
      "new_id": "dd24b0cdbbdda50997ec0cacdf569cae7fa2c613",
      "new_mode": 33261,
      "new_path": "t/t5520-pull.sh"
    }
  ]
}