)]}'
{
  "commit": "68aa495b590d417e88562ab1e5da7d84d0531f21",
  "tree": "2eac6a51dc285d5298c44b30444b91a123c1af8b",
  "parents": [
    "c91c944a068e12eca5d4b6040ad05c7068437111"
  ],
  "author": {
    "name": "Elijah Newren",
    "email": "newren@gmail.com",
    "time": "Tue Dec 11 08:11:39 2018 -0800"
  },
  "committer": {
    "name": "Junio C Hamano",
    "email": "gitster@pobox.com",
    "time": "Mon Jan 07 11:55:23 2019 -0800"
  },
  "message": "rebase: implement --merge via the interactive machinery\n\nAs part of an ongoing effort to make rebase have more uniform behavior,\nmodify the merge backend to behave like the interactive one, by\nre-implementing it on top of the latter.\n\nInteractive rebases are implemented in terms of cherry-pick rather than\nthe merge-recursive builtin, but cherry-pick also calls into the\nrecursive merge machinery by default and can accept special merge\nstrategies and/or special strategy options.  As such, there really is\nnot any need for having both git-rebase--merge and\ngit-rebase--interactive anymore.  Delete git-rebase--merge.sh and\ninstead implement it in builtin/rebase.c.\n\nThis results in a few deliberate but small user-visible changes:\n  * The progress output is modified (see t3406 and t3420 for examples)\n  * A few known test failures are now fixed (see t3421)\n  * bash-prompt during a rebase --merge is now REBASE-i instead of\n    REBASE-m.  Reason: The prompt is a reflection of the backend in use;\n    this allows users to report an issue to the git mailing list with\n    the appropriate backend information, and allows advanced users to\n    know where to search for relevant control files.  (see t9903)\n\ntestcase modification notes:\n  t3406: --interactive and --merge had slightly different progress output\n         while running; adjust a test to match the new expectation\n  t3420: these test precise output while running, but rebase--am,\n         rebase--merge, and rebase--interactive all were built on very\n         different commands (am, merge-recursive, cherry-pick), so the\n         tests expected different output for each type.  Now we expect\n         --merge and --interactive to have the same output.\n  t3421: --interactive fixes some bugs in --merge!  Wahoo!\n  t9903: --merge uses the interactive backend so the prompt expected is\n         now REBASE-i.\n\nSigned-off-by: Elijah Newren \u003cnewren@gmail.com\u003e\nSigned-off-by: Junio C Hamano \u003cgitster@pobox.com\u003e\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "0d77ea5894274c43c4b348c8b52b8e665a1a339e",
      "old_mode": 33188,
      "old_path": ".gitignore",
      "new_id": "910b1d2d2f003b8ee076fb0989c4e14c6c5bb1f3",
      "new_mode": 33188,
      "new_path": ".gitignore"
    },
    {
      "type": "modify",
      "old_id": "dff17b31788fec085b91314b3b3328c689050628",
      "old_mode": 33188,
      "old_path": "Documentation/git-rebase.txt",
      "new_id": "8bfa36a18527c3833f5f8d7e2b8e665262ccbaa9",
      "new_mode": 33188,
      "new_path": "Documentation/git-rebase.txt"
    },
    {
      "type": "modify",
      "old_id": "1a44c811aa56330327172cf693c61f9a221e4e16",
      "old_mode": 33188,
      "old_path": "Makefile",
      "new_id": "82e1eb1a4a690ba58b55c62f1971403272545fc5",
      "new_mode": 33188,
      "new_path": "Makefile"
    },
    {
      "type": "modify",
      "old_id": "ec2e5fbf23ceecb97dc906b96e6c719e154f3617",
      "old_mode": 33188,
      "old_path": "builtin/rebase.c",
      "new_id": "d95843a8d4b5f6c8ad6e8784d91c8ba08f1d8adf",
      "new_mode": 33188,
      "new_path": "builtin/rebase.c"
    },
    {
      "type": "modify",
      "old_id": "6baf10192dd7d81a714b29e9cd230435637c1b44",
      "old_mode": 33261,
      "old_path": "git-legacy-rebase.sh",
      "new_id": "0c9c19bc60a06ce72f356a7dd6eb9c713998f747",
      "new_mode": 33261,
      "new_path": "git-legacy-rebase.sh"
    },
    {
      "type": "delete",
      "old_id": "ced38bb3a65955d30ee7f8c785a51ac1389b5f66",
      "old_mode": 33188,
      "old_path": "git-rebase--merge.sh",
      "new_id": "0000000000000000000000000000000000000000",
      "new_mode": 0,
      "new_path": "/dev/null"
    },
    {
      "type": "modify",
      "old_id": "f64b130cb805bbca8475f3c262693fa0faa2cafe",
      "old_mode": 33261,
      "old_path": "t/t3406-rebase-message.sh",
      "new_id": "b393e1e9fee88bb9b3df6ecc8544dfa370086e41",
      "new_mode": 33261,
      "new_path": "t/t3406-rebase-message.sh"
    },
    {
      "type": "modify",
      "old_id": "4c7494cc8f77a3ff92373cb130974825c4418ada",
      "old_mode": 33261,
      "old_path": "t/t3420-rebase-autostash.sh",
      "new_id": "2d1094e4831a88205133558d2ca6ac5ac07209d1",
      "new_mode": 33261,
      "new_path": "t/t3420-rebase-autostash.sh"
    },
    {
      "type": "modify",
      "old_id": "23ad4cff35a74c9ffb8656f61e777d633459cb77",
      "old_mode": 33261,
      "old_path": "t/t3421-rebase-topology-linear.sh",
      "new_id": "7274dca40b1ccf0d32aeb98e7b0acec59daaa14d",
      "new_mode": 33261,
      "new_path": "t/t3421-rebase-topology-linear.sh"
    },
    {
      "type": "modify",
      "old_id": "81a5179e28bf529bc2f0a8bc197108fcb69fba72",
      "old_mode": 33261,
      "old_path": "t/t9903-bash-prompt.sh",
      "new_id": "5cadedb2a9bc6eb66b9ead3ccae037e62a655f2c",
      "new_mode": 33261,
      "new_path": "t/t9903-bash-prompt.sh"
    }
  ]
}