)]}'
{
  "commit": "1c7fee5d0857d809fe5d93a1d56968e44296ce55",
  "tree": "4d0822b10665035d4675cb5a4058d4306faa3bd9",
  "parents": [
    "d10ed827bcf5f07c173313d4575e1d6c720dc25f",
    "cfcbd3427e67056a00ec832645b057eaf33888d9",
    "c436eb8cf1efa3fe2c70100ae0cbc48f0feaf5af"
  ],
  "author": {
    "name": "Junio C Hamano",
    "email": "junkio@cox.net",
    "time": "Sat Mar 04 16:18:43 2006 -0800"
  },
  "committer": {
    "name": "Junio C Hamano",
    "email": "junkio@cox.net",
    "time": "Sat Mar 04 16:18:43 2006 -0800"
  },
  "message": "Cauterize dropped or duplicate bits from next.\n\nI am very sorry to do this, but without this funky octopus, \"git\nlog --no-merges master..next\" will show commits already merged\ninto \"master\" forever.\n\nThere are some commits on the next branch (which is never to be\nrewound) that are reverts of other commits on the next branch.\nThey are to revert the finer grained delta experiments that\nturned out to have undesirable performance effects.  Also there\nare some other commits that were first done as a merge into\n\"next\" (a pull request based on next) and then cherry picked\ninto master.  Since they are not going to be merged into\n\"master\" ever, they will stay forever in \"log master..next\".\n\nYuck.\n\nSo this commit records the fact that the commits currently shown\nby \"git log --no-merges master..next\" to be merged into \"master\"\nare already in the master, either because they really are (in\nthe case of git-cvsserver bits, which needed cherry-picking into\n\"master\"), or because they are fully reverted in \"next\" (in the\ncase of finer-grained delta bits).\n\nHere is the way I made this commit:\n\n (1) Inspect \"gitk --no-merges --parents master..next\"\n\n     This shows what git thinks are missing from master.  It\n     shows chain of commits that are already merged and chain of\n     commits whose net effect should amount to a no-op.\n\n     Look at each commits and make sure they are either unwanted\n     or already merged by cherry-picking.\n\n (2) Record the tip of branches that I do not want.  In this\n     case, the following were unwanted:\n\n     cfcbd3427e67056a00ec832645b057eaf33888d9 cvsserver\n     c436eb8cf1efa3fe2c70100ae0cbc48f0feaf5af diff-delta\n     38fd0721d0a2a1a723bc28fc0817e3571987b1ef diff-delta\n     f0bcd511ee3a00b7fd3975a386aa1165c07a0721 cvsserver\n     2b8d9347aa1a11f1ac13591f89ca9f984d467c77 diff-delta\n\n (3) Shorten the list by finding independent ones from the\n     above.\n\n     $ git show-branch --independent $the $above $tips\n     \n     cfcbd3427e67056a00ec832645b057eaf33888d9\n     c436eb8cf1efa3fe2c70100ae0cbc48f0feaf5af\n\n (4) Checkout \"master\" and cauterize them with \"ours\" strategy:\n\n     $ git merge -s ours \"`cat $this-file`\" HEAD cfcbd3 c436eb\n",
  "tree_diff": []
}